summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-06-13release-request-2ec08f61-b94c-464b-8a22-2d354ef71488-for-git_oc-dr1-release-4...android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21caf/aosp-new/oreo-dr3-releasecaf/aosp-new/oreo-dr2-releasecaf/aosp-new/oreo-dr1-releaseandroid-build-team Robot1-0/+2
2017-06-09Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVELcaf/aosp-new/oreo-dr1-devYifan Hong1-0/+2
2017-06-01release-request-e5546013-e96c-4ee5-90aa-42a79d072375-for-git_oc-dr1-release-4...android-build-team Robot1-3/+5
2017-05-31Generate syntactically correct java for imports from classes with no packages.Joe Onorato1-3/+5
2017-04-21Merge "mark libprotobuf-cpp-* as VNDK" am: 06884d010c am: 7f33a820b3 am: 41cc...Jiyong Park1-2/+6
2017-04-21Merge "mark libprotobuf-cpp-* as VNDK" am: 06884d010c am: 7f33a820b3Jiyong Park1-2/+6
2017-04-21Merge "mark libprotobuf-cpp-* as VNDK" am: 06884d010cJiyong Park1-2/+6
2017-04-21Merge "mark libprotobuf-cpp-* as VNDK"Jiyong Park1-2/+6
2017-04-21Merge "mark libprotobuf-cpp-* as VNDK"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4caf/aosp-new/n-iot-preview-4Treehugger Robot1-2/+6
2017-04-20mark libprotobuf-cpp-* as VNDKJiyong Park1-2/+6
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-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-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