aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 1b3c7f48: am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep ↵Max Cai2015-03-200-0/+0
|\ | | | | | | | | | | pointers to extension values." * commit '1b3c7f48c93900ac850269004cfc96489f487861':
| * am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to ↵Max Cai2014-08-210-0/+0
| |\ | | | | | | | | | | | | | | | extension values." * commit 'b172d66772c921589a1338f00b34ff5bc3bcc225':
* | \ am cb095d21: am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am ↵Ying Wang2015-03-200-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | 8eed3705: You CANNOT change the global WITH_DEXPREOPT * commit 'cb095d21de77c2f261dddf6402764f7868082615':
| * | am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT ↵Ying Wang2014-08-210-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | change the global WITH_DEXPREOPT * commit 'e9d25570a8f67156a77260176b4a7a6f008e156c':
* | \ \ am ca524e2f: am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am ↵Baligh Uddin2015-03-200-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit 'ca524e2f9e94099d2399d6487a4d9b6fe02509ed':
| * | | am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep ↵Baligh Uddin2014-08-210-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit 'b088989c421c7d7379632ffb4f1fdc221ed9d2c9':
* | \ \ \ am 62a0f9d4: am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge ↵Wink Saville2015-03-200-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit '62a0f9d481ce6c5525dd93007afbdf092e011237':
| * | | | am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit 'b38ef83f969221c2cbb891e609bb80f7a53a034d':
* | \ \ \ \ am f95440f8: am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit ↵Wink Saville2015-03-200-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | \'e887563a\' into fix-merge-conclict" * commit 'f95440f837799b2ffa6aea68dbdb3251550a9b79':
| * | | | | am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into fix-merge-conclict" * commit '8add9962a5c88ff307d573be91bb091a2b14568d':
* | \ \ \ \ \ am 4344e415: am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am ↵Jan-Willem Maarse2015-03-200-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit '4344e415b9ed3da78da50853e288aaec5cc515cb':
| * | | | | | am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am ↵Jan-Willem Maarse2014-08-210-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit '1944e19cb1dc82a52d46a42fe8a0ed4037602565':
* | \ \ \ \ \ \ am 549268de: am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am ↵Bill Yi2015-03-200-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit '549268de5c242ab7948b53bc5f8e8a83d33b72fe':
| * | | | | | | am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am ↵Bill Yi2014-08-210-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit '7f3f30e96965e7189430e4acc53520275627264c':
* | \ \ \ \ \ \ \ am 6d2d0f40: am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am ↵Jeff Davidson2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8113c186: resolved conflicts for merge of 592b6078 to master * commit '6d2d0f4023043221456fd263e33648b1ab6bc502':
| * | | | | | | | am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved ↵Jeff Davidson2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts for merge of 592b6078 to master * commit '7bf587289933768ada48e79cf43deecfad65c576':
* | \ \ \ \ \ \ \ \ am 563f32c4: am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" * commit '563f32c433628a38440b1d799f52c1d4f889aaf3':
| * | | | | | | | | am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" * commit 'ee16014efd4d8a9aff0fd6efc40782ce250a1cd8':
* | \ \ \ \ \ \ \ \ \ am 0d0b3264: am 2b469993: am 61317c32: am 90048528: am 888cafe4: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '0d0b326431b54d4b59a3405a7c5c63f8ed4d3a8b':
| * | | | | | | | | | am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '2b4699938126550d4e6ba7a3e0f70672c2625c20':
* | \ \ \ \ \ \ \ \ \ \ am 985244ab: am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am ↵Wink Saville2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '985244abea85772c5fa4cae5012af903ca59a30a':
| * | | | | | | | | | | am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit 'dc94687566ba7d98f65e4769d9c0e7d2f20ce895':
* | \ \ \ \ \ \ \ \ \ \ \ am 70f9fdd3: am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit ↵Wink Saville2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'f65ee555\' into fix-merge-conflict * commit '70f9fdd38c40a4cb1aaeeb34f45f087d23bdf549':
| * | | | | | | | | | | | am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into fix-merge-conflict * commit '9160bc69c92253ddcdbe30a6737adc2bcc515c66':
* | \ \ \ \ \ \ \ \ \ \ \ \ am 75244665: am 89f0407f: am 232698c4: am de6420aa: am d89b3060: am ↵Wink Saville2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '75244665e3b7d228b0887d0ff43a84a30c358f62':
| * | | | | | | | | | | | | am 89f0407f: am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '89f0407f57f9127ab8d1040a06af741173faece2':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am 8345e3e6: am b28d1738: am 0cb1a2f6: am c8f69926: am 27243737: am ↵Wink Saville2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" * commit '8345e3e6d8965a5cc2aa7a3067f3e2b1e7b032f0':
| * | | | | | | | | | | | | | am b28d1738: am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" * commit 'b28d17386a434ee49e48d958823141036ed8c127':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5cba1b7d: am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." * commit '5cba1b7dcad5909a72e940bc15a1480327d104fb':
| * | | | | | | | | | | | | | | am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 214997ce: am afc1553a: Merge "Extension overhaul." * commit '339f5a6db8053b4095af6454250e246ffeb8b295':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fc9b38a1: am 34559f88: am 1b9cb7b2: am 0eaea6a8: am 286f5705: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f * commit 'fc9b38a1992610a6a0e3b51dad39901df293a980':
| * | | | | | | | | | | | | | | | am 34559f88: am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f * commit '34559f88be5c2071a9be321ed01725b364cdf29d':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4cce7ca7: am 6f45464e: am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved ↵Jie Dai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp * commit '4cce7ca7d4cf026a62a1fd5b37b7e028040866da':
| * | | | | | | | | | | | | | | | | am 6f45464e: am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for ↵Jie Dai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge of 6965d891 to klp-modular-dev-plus-aosp * commit '6f45464eb45eba2846ee9e96aaecd81fef4662ef':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dc08aae5: am cb395443: am 5843426a: am 0c063c66: am fa7bf363: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." * commit 'dc08aae549f3a38bc6b1cc5a1facbbcadf4969f4':
| * | | | | | | | | | | | | | | | | | am cb395443: am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." * commit 'cb395443fb9a2066dba2a5c0f71aaf088fd0ad1c':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 99f1c88b: am c1d044c0: am d043ff9d: am 06396abf: am 2c210bb9: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit '99f1c88ba4039deed33328dea1e9dc38e8ca0134':
| * | | | | | | | | | | | | | | | | | | am c1d044c0: am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit 'c1d044c0b1b97265e3bef096acdaa503d9ec615a':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2b0e6788: am ddf77b19: am b22123d1: am e41d4c04: am 0ea68954: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit '2b0e6788f9eab2271b28591383ed7db2309e69d4':
| * | | | | | | | | | | | | | | | | | | | am ddf77b19: am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit 'ddf77b1914d3f2b0bd1310cedc41713fe7d2fbe4':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 18072b1d: am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am ↵Andrew Flynn2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit '18072b1d0063576040575f8970d36f11a8527fbc':
| * | | | | | | | | | | | | | | | | | | | | am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am ↵Andrew Flynn2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit 'a155ce7ea537b9388e0785d74363f3e11177a5e0':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 31111e30: am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit '31111e302e14330c3868e6b1456dbe1e0293edef':
| * | | | | | | | | | | | | | | | | | | | | | am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit 'dad271e9a19fe98c4dd987ee5398b316309ace3e':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6a8d85c1: am 3a324516: am 01d1cdeb: am 175d44db: am aa721735: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" * commit '6a8d85c1211dd2382df6991db27872de8d990948':
| * | | | | | | | | | | | | | | | | | | | | | | am 3a324516: am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" * commit '3a324516bd8757996725ac3c28224bc41d5123be':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f29d4247: am 8d5b7fb2: am 23b66756: am bfa5ee2f: am 2f879713: am ↵The Android Open Source Project2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit 'f29d4247c76645649c4d205abaa22eeffe1f177d':
| * | | | | | | | | | | | | | | | | | | | | | | | am 8d5b7fb2: am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am ↵The Android Open Source Project2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit '8d5b7fb23a951dabb95bce445ef588b68e6b0e63':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ca65c1f6: am 6d879b4e: am e747813b: am 6a76a968: am dee682fd: am ↵The Android Open Source Project2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit 'ca65c1f662624e72dc2e2da0604d869972fc73ce':
| * | | | | | | | | | | | | | | | | | | | | | | | | am 6d879b4e: am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am ↵The Android Open Source Project2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit '6d879b4e0d411dd925978437c43e052cf3fba00e':
generated by cgit v1.1 at 2025-01-05 18:12:20 +0000