summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-03-14OPR1.170313.002_AOSP_MergeLA.UM.6.6.r1-04400-89xx.0LA.UM.6.6.r1-04300-89xx.0LA.UM.6.6.r1-04100-89xx.0LA.UM.6.6.r1-04000-89xx.0LA.UM.6.6.r1-03400-89xx.0LA.UM.6.6.r1-03000-89xx.0LA.UM.6.6.r1-02700-89xx.0LA.UM.6.5.r1-04300-8x96.0LA.UM.6.5.r1-04100-8x96.0LA.UM.6.5.r1-04000-8x96.0LA.UM.6.5.r1-03400-8x96.0LA.UM.6.5.r1-03000-8x96.0LA.UM.6.5.r1-02500-8x96.0LA.UM.6.4.r4-00300-8x98.0LA.UM.6.4.r2-05700-8x98_latv.0LA.UM.6.4.r2-05000-8x98_latv.0LA.UM.6.4.r2-04200-8x98_latv.0LA.UM.6.4.r2-04100-8x98_latv.0LA.UM.6.4.r1-05200-8x98.0LA.UM.6.4.r1-05100-8x98.0LA.UM.6.4.r1-04900-8x98.0LA.UM.6.4.r1-04300-8x98.0LA.UM.6.4.r1-04100-8x98.0LA.UM.6.4.r1-04000-8x98.0LA.UM.6.4.r1-03800-8x98.0LA.UM.6.4.r1-03500-8x98.0LA.UM.6.4.r1-03200-8x98.0LA.UM.6.4.c1-03600-8x98.0LA.UM.6.2.r1-05200-sdm660.0LA.UM.6.2.r1-05100-sdm660.0LA.UM.6.2.r1-04900-sdm660.0LA.UM.6.2.r1-04400-sdm660.0LA.UM.6.2.r1-04300-sdm660.0LA.UM.6.2.r1-04000-sdm660.0LA.UM.6.2.r1-03800-sdm660.0LA.UM.6.2.r1-03600-sdm660.0LA.UM.6.2.r1-03400-sdm660.0LA.HB.1.1.5.c1-06500-8x96_gvmq.0LA.HB.1.1.5.c1-06500-8x96.0LA.HB.1.1.5.c1-02400-8x96_gvmq.0LA.HB.1.1.5.c1-01410-8x96_gvmq.0LA.HB.1.1.5.c1-01410-8x96.0LA.HB.1.1.5.c1-01210-8x96.0LA.HB.1.1.5-03710-8x96.0LA.HB.1.1.5-03110-8x96.0LA.HB.1.1.5-02610-8x96.0LA.HB.1.1.5-02510-8x96.0LA.HB.1.1.5-02310-8x96.0LA.HB.1.1.5-02110-8x96.0LA.HB.1.1.5-01910-8x96.0LA.HB.1.1.5-01610-8x96.0LA.HB.1.1.5-01410-8x96.0LA.HB.1.1.5-00800-8x96_gvmq.0LA.BR.1.3.7-03510-8976.0LA.BR.1.3.7-03010-8976.0LA.BR.1.3.7-02510-8976.0LA.BR.1.3.7-02410-8976.0LA.BR.1.3.7-02010-8976.0LA.BR.1.3.7-01310-8976.0LA.BR.1.3.7-01210-8976.0LA.BR.1.3.7-01010-8976.0LA.BR.1.2.9.1-02310-8x16.0LA.BR.1.2.9.1-01910-8x16.0LA.BR.1.2.9.1-01310-8x16.0LA.BR.1.2.9.1-01110-8x16.0caf/android-external.lnx.3.0caf/android-external.lnx.2.9.1.r5-relcaf/android-external.lnx.2.9.1.r3-relcaf/android-external.lnx.2.9.1.r2-relcaf/LA.UM.6.4.r4caf/LA.HB.1.1.5_rb1.9caf/LA.HB.1.1.5_rb1.8caf/LA.HB.1.1.5_rb1.15caf/LA.HB.1.1.5_rb1.13caf/LA.HB.1.1.5_rb1.12caf/LA.HB.1.1.5_rb1.11caf/LA.HB.1.1.5.c1_rb1.6caf/LA.HB.1.1.5.c1_rb1.5caf/LA.HB.1.1.5.c1caf/LA.BR.1.3.7_rb1.8caf/LA.BR.1.3.7_rb1.6caf/LA.BR.1.3.7_rb1.5caf/LA.BR.1.3.7_rb1.4caf/LA.BR.1.3.7_rb1.3caf/LA.BR.1.2.9.1_rb1.5caf/LA.BR.1.2.9.1_rb1.4caf/LA.BR.1.2.9.1_rb1.3caf/LA.BR.1.2.9.1_rb1.2caf/LA.BR.1.2.9.1_rb1.1Divya Sharma2-0/+5
2017-02-28resolve merge conflicts of 4bb8a91 to masterandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1caf/aosp-new/security-oc-releasecaf/aosp-new/oreo-vts-releasecaf/aosp-new/oreo-security-releasecaf/aosp-new/oreo-releasecaf/aosp-new/oreo-r6-releasecaf/aosp-new/oreo-r5-releasecaf/aosp-new/oreo-r4-releasecaf/aosp-new/oreo-r3-releasecaf/aosp-new/oreo-r2-releasecaf/aosp-new/oreo-devcaf/aosp-new/oreo-cts-releaseAurimas Liutikas2-0/+5
2017-02-28Merge "Pull in two patches from protobuf upstream to suppress warnings" am: f...Aurimas Liutikas2-0/+5
2017-02-28Merge "Pull in two patches from protobuf upstream to suppress warnings"Aurimas Liutikas2-0/+5
2017-02-28Merge "Pull in two patches from protobuf upstream to suppress warnings"android-o-preview-1android-n-mr2-preview-2caf/aosp-new/o-previewAurimas Liutikas2-0/+5
2017-02-28Pull in two patches from protobuf upstream to suppress warningsAurimas Liutikas2-0/+5
2017-02-27OPR1.170223.006_AOSP_MergeDivya Sharma1-2/+10
2017-02-21Merge "Don't execute code before checking a class is a messagenano." am: 89eb...Jeff Davidson0-0/+0
2017-02-21Merge "Don't execute code before checking a class is a messagenano." am: 89eb...Jeff Davidson1-2/+10
2017-02-21Merge "Don't execute code before checking a class is a messagenano."Jeff Davidson1-2/+10
2017-02-21Merge "Don't execute code before checking a class is a messagenano."Treehugger Robot1-2/+10
2017-02-21Don't execute code before checking a class is a messagenano.Jeff Davidson1-2/+10
2017-02-16Don't execute code before checking a class is a messagenano.Jeff Davidson1-2/+10
2017-02-09OPR1.170208.003_AOSP_MergeDivya Sharma3-6/+15
2017-01-31Use GOOGLE_CHECK Macro for validationMark Urbanus2-6/+6
2017-01-27Introduce a libprotobuf-cpp-lite_static for the hostMark Urbanus1-0/+9
2017-01-18DO NOT MERGE: Revert "Merge remote-tracking branch 'goog/protobuf3' into 'goo...Tamas Berghammer0-0/+0
2017-01-18DO NOT MERGE: Revert "Fix the Gradle build file after the proto3 update" am: ...Tamas Berghammer0-0/+0
2017-01-18DO NOT MERGE: Revert "Add a flag to use offset/length with byte arrays." am: ...Tamas Berghammer0-0/+0
2017-01-18DO NOT MERGE: Revert "Parse unknown enum values like full proto2." am: 6f1886...Tamas Berghammer0-0/+0
2017-01-18DO NOT MERGE: Revert "Merge remote-tracking branch 'goog/protobuf3' into 'goo...Tamas Berghammer1457-447395/+84299
2017-01-18DO NOT MERGE: Revert "Fix the Gradle build file after the proto3 update"Tamas Berghammer1-33/+18
2017-01-18DO NOT MERGE: Revert "Add a flag to use offset/length with byte arrays."Tamas Berghammer9-216/+17
2017-01-18DO NOT MERGE: Revert "Parse unknown enum values like full proto2."Tamas Berghammer4-196/+14
2017-01-18Parse unknown enum values like full proto2. am: 3686bacb71Jeff Davidson0-0/+0
2017-01-18Add a flag to use offset/length with byte arrays. am: 4d68239ebcJeff Davidson0-0/+0
2017-01-18Fix the Gradle build file after the proto3 update am: 91f7e3d893Tamas Berghammer0-0/+0
2017-01-18Merge remote-tracking branch 'goog/protobuf3' into 'goog/master' am: f1ee8f0477Tamas Berghammer0-0/+0
2017-01-18DO NOT MERGE: Revert "Merge remote-tracking branch 'goog/protobuf3' into 'goo...Tamas Berghammer1457-447395/+84299
2017-01-18DO NOT MERGE: Revert "Fix the Gradle build file after the proto3 update"Tamas Berghammer1-33/+18
2017-01-18DO NOT MERGE: Revert "Add a flag to use offset/length with byte arrays."Tamas Berghammer9-216/+17
2017-01-18DO NOT MERGE: Revert "Parse unknown enum values like full proto2."Tamas Berghammer4-196/+14
2017-01-18Parse unknown enum values like full proto2.Jeff Davidson4-14/+196
2017-01-18Add a flag to use offset/length with byte arrays.Jeff Davidson9-17/+216
2017-01-18Fix the Gradle build file after the proto3 updateTamas Berghammer1-18/+33
2017-01-18Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'Tamas Berghammer1457-84299/+447395
2016-11-17Parse unknown enum values like full proto2.Jeff Davidson4-14/+196
2016-11-17Add a flag to use offset/length with byte arrays.Jeff Davidson9-17/+216
2016-11-16Fix the Gradle build file after the proto3 updateTamas Berghammer1-18/+33
2016-11-16Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'Tamas Berghammer1457-84299/+447395
2016-11-14Parse unknown enum values like full proto2.Jeff Davidson4-14/+196
2016-11-14Add a flag to use offset/length with byte arrays.Jeff Davidson9-17/+216
2016-11-10Fix the Gradle build file after the proto3 updateTamas Berghammer1-18/+33
2016-11-09Merge "Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'"Tamas Berghammer1457-84299/+447395
2016-11-08Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'Tamas Berghammer1457-84299/+447395
2016-10-12Build libprotoc - for making plugins to protoc.Joe Onorato2-0/+173
2016-09-06Merge "Emit macros with proper parentheses." am: 7d33a02d15 am: a27e302c46 am...Chih-hung Hsieh2-7/+7
2016-09-06Merge "Emit macros with proper parentheses." am: 7d33a02d15 am: a27e302c46android-n-mr2-preview-1Chih-hung Hsieh2-7/+7
2016-09-06Merge "Emit macros with proper parentheses." am: 7d33a02d15Chih-hung Hsieh2-7/+7
2016-09-06Merge "Emit macros with proper parentheses."Chih-hung Hsieh2-7/+7