 Max Cai
|
9ceb3d4acc
Fix how getRepeatedFieldArrayLength works
|
11 lat temu |
|
liujisi@google.com
|
c5553a3d18
Down-integrate pending changes from internal repository after previous release.
|
12 lat temu |
|
Ying Wang
|
30cd2a4a98
am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
|
12 lat temu |
|
Baligh Uddin
|
c7213e1c39
am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
|
12 lat temu |
|
Ying Wang
|
b18d5c1d43
am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
|
12 lat temu |
|
Baligh Uddin
|
f5759da88c
am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
|
12 lat temu |
|
Ying Wang
|
82461de508
You CANNOT change the global WITH_DEXPREOPT
|
12 lat temu |
|
Baligh Uddin
|
709cb7348e
keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
|
12 lat temu |
|
Qiwen Zhao
|
1d50c6b47c
reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81
|
12 lat temu |
|
Wink Saville
|
9db6d437df
am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
|
12 lat temu |
|
Wink Saville
|
3b0952fb80
Revert "Merge commit 'e887563a' into fix-merge-conclict"
|
12 lat temu |
|
Wink Saville
|
d9b892d45b
Merge "Revert "Merge commit 'e887563a' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
|
12 lat temu |
|
Wink Saville
|
fadc11055e
Revert "Merge commit 'e887563a' into fix-merge-conclict"
|
12 lat temu |
|
Jan-Willem Maarse
|
9a58c6f56c
am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
|
12 lat temu |
|
Bill Yi
|
ef5fd0e053
am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
|
12 lat temu |
|
Jeff Davidson
|
be8aadfd3b
am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
|
12 lat temu |
|
Max Cai
|
8b6445a019
am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
|
12 lat temu |
|
Max Cai
|
8624f47bab
am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
|
12 lat temu |
|
Wink Saville
|
b67c3fa484
am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
|
12 lat temu |
|
Wink Saville
|
642f7003a7
Merge commit 'f65ee555' into fix-merge-conflict
|
12 lat temu |
|
Jan-Willem Maarse
|
9ad944e2d6
am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
|
12 lat temu |
|
Bill Yi
|
e76c2cefee
am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
|
12 lat temu |
|
Jeff Davidson
|
a3d1a03fc1
am 8113c186: resolved conflicts for merge of 592b6078 to master
|
12 lat temu |
|
Max Cai
|
ba0ea9552f
am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
|
12 lat temu |
|
Max Cai
|
78e5e83012
am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
|
12 lat temu |
|
Wink Saville
|
b05e2ffe0c
am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
|
12 lat temu |
|
Wink Saville
|
2666d4df51
Merge commit 'e887563a' into fix-merge-conclict
|
12 lat temu |
|
Wink Saville
|
f812e7f2ca
am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
|
12 lat temu |
|
Wink Saville
|
bf2bb67903
am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
|
12 lat temu |
|
Max Cai
|
42c481a7f5
am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
|
12 lat temu |
