aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-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_r26android-cts-8.0_r25android-cts-8.0_r24android-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_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-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_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseAurimas Liutikas
2017-02-28Merge "Pull in two patches from protobuf upstream to suppress warnings" am: f...Aurimas Liutikas
2017-02-28Merge "Pull in two patches from protobuf upstream to suppress warnings"Aurimas Liutikas
2017-02-28Merge "Pull in two patches from protobuf upstream to suppress warnings"android-o-preview-1android-n-mr2-preview-2o-previewAurimas Liutikas
2017-02-28Pull in two patches from protobuf upstream to suppress warningsAurimas Liutikas
2017-02-21Merge "Don't execute code before checking a class is a messagenano." am: 89eb...Jeff Davidson
2017-02-21Merge "Don't execute code before checking a class is a messagenano." am: 89eb...Jeff Davidson
2017-02-21Merge "Don't execute code before checking a class is a messagenano."Jeff Davidson
2017-02-21Merge "Don't execute code before checking a class is a messagenano."Treehugger Robot
2017-02-21Don't execute code before checking a class is a messagenano.Jeff Davidson
2017-02-16Don't execute code before checking a class is a messagenano.Jeff Davidson
2017-01-31Use GOOGLE_CHECK Macro for validationMark Urbanus
2017-01-27Introduce a libprotobuf-cpp-lite_static for the hostMark Urbanus
2017-01-18DO NOT MERGE: Revert "Merge remote-tracking branch 'goog/protobuf3' into 'goo...Tamas Berghammer
2017-01-18DO NOT MERGE: Revert "Fix the Gradle build file after the proto3 update" am: ...Tamas Berghammer
2017-01-18DO NOT MERGE: Revert "Add a flag to use offset/length with byte arrays." am: ...Tamas Berghammer
2017-01-18DO NOT MERGE: Revert "Parse unknown enum values like full proto2." am: 6f1886...Tamas Berghammer
2017-01-18DO NOT MERGE: Revert "Merge remote-tracking branch 'goog/protobuf3' into 'goo...Tamas Berghammer
2017-01-18DO NOT MERGE: Revert "Fix the Gradle build file after the proto3 update"Tamas Berghammer
2017-01-18DO NOT MERGE: Revert "Add a flag to use offset/length with byte arrays."Tamas Berghammer
2017-01-18DO NOT MERGE: Revert "Parse unknown enum values like full proto2."Tamas Berghammer
2017-01-18Parse unknown enum values like full proto2. am: 3686bacb71Jeff Davidson
2017-01-18Add a flag to use offset/length with byte arrays. am: 4d68239ebcJeff Davidson
2017-01-18Fix the Gradle build file after the proto3 update am: 91f7e3d893Tamas Berghammer
2017-01-18Merge remote-tracking branch 'goog/protobuf3' into 'goog/master' am: f1ee8f0477Tamas Berghammer
2017-01-18DO NOT MERGE: Revert "Merge remote-tracking branch 'goog/protobuf3' into 'goo...Tamas Berghammer
2017-01-18DO NOT MERGE: Revert "Fix the Gradle build file after the proto3 update"Tamas Berghammer
2017-01-18DO NOT MERGE: Revert "Add a flag to use offset/length with byte arrays."Tamas Berghammer
2017-01-18DO NOT MERGE: Revert "Parse unknown enum values like full proto2."Tamas Berghammer
2017-01-18Parse unknown enum values like full proto2.Jeff Davidson
2017-01-18Add a flag to use offset/length with byte arrays.Jeff Davidson
2017-01-18Fix the Gradle build file after the proto3 updateTamas Berghammer
2017-01-18Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'Tamas Berghammer
2016-11-17Parse unknown enum values like full proto2.Jeff Davidson
2016-11-17Add a flag to use offset/length with byte arrays.Jeff Davidson
2016-11-16Fix the Gradle build file after the proto3 updateTamas Berghammer
2016-11-16Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'Tamas Berghammer
2016-11-14Parse unknown enum values like full proto2.Jeff Davidson
2016-11-14Add a flag to use offset/length with byte arrays.Jeff Davidson
2016-11-10Fix the Gradle build file after the proto3 updateTamas Berghammer
2016-11-09Merge "Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'"Tamas Berghammer
2016-11-08Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'Tamas Berghammer
2016-10-12Build libprotoc - for making plugins to protoc.Joe Onorato
2016-09-06Merge "Emit macros with proper parentheses." am: 7d33a02d15 am: a27e302c46 am...Chih-hung Hsieh
2016-09-06Merge "Emit macros with proper parentheses." am: 7d33a02d15 am: a27e302c46android-n-mr2-preview-1Chih-hung Hsieh
2016-09-06Merge "Emit macros with proper parentheses." am: 7d33a02d15Chih-hung Hsieh
2016-09-06Merge "Emit macros with proper parentheses."Chih-hung Hsieh
2016-09-06Merge "Emit macros with proper parentheses."android-n-mr1-preview-2android-n-mr1-preview-1Chih-hung Hsieh
2016-09-06Emit macros with proper parentheses.Chih-Hung Hsieh
2016-08-12Support building lite static libraries on host and platform. am: 48b07ad0a7 a...Yabin Cui