aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-11-06Merge "Revert "Merge changes from topic "protobuf3.5.2"""android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseColin Cross
2018-11-05Merge "Attempt to fix mac build"Colin Cross
2018-11-04Attempt to fix mac buildColin Cross
2018-11-04Revert "Merge changes from topic "protobuf3.5.2""Colin Cross
2018-11-05Merge changes from topic "protobuf3.5.2"Colin Cross
2018-11-01Remove libprotobuf-java-liteColin Cross
2018-11-01Update stubsColin Cross
2018-11-01Revert "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"Colin Cross
2018-11-01Update javamicro to compile against v3.5.2Colin Cross
2018-11-01Update Android.bp to match BUILDColin Cross
2018-11-01Rerun configureColin Cross
2018-11-01Merge tag 'v3.5.2' into masterColin Cross
2018-11-01Revert "Remove 2 usage of isspace as they are not stl port compatible"Colin Cross
2018-11-01Revert "Use GOOGLE_CHECK Macro for validation"Colin Cross
2018-11-01Revert "Emit macros with proper parentheses."Colin Cross
2018-11-01Revert "Generate syntactically correct java for imports from classes with no ...Colin Cross
2018-11-01Revert "Fix some unused parameter warnings"Colin Cross
2018-11-01Revert "protobuf: work around a static analyzer bug"Colin Cross
2018-11-01Revert "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."Colin Cross
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
2018-10-12Merge "Make the protobuf directory match closer to upstream"Colin Cross
2018-10-12Merge "Make the protobuf directory match closer to upstream"android-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-releaseTreehugger Robot
2018-10-11Make the protobuf directory match closer to upstreamColin Cross
2018-10-11Merge "Revert "Make the protobuf directory match closer to upstream""Colin Cross
2018-10-12Merge "Revert "Make the protobuf directory match closer to upstream""Colin Cross
2018-10-12Revert "Make the protobuf directory match closer to upstream"Colin Cross
2018-10-11Merge changes I1d718e9d,Icc74ff16Colin Cross
2018-10-11Merge changes I1d718e9d,Icc74ff16Colin Cross
2018-10-11Make the protobuf directory match closer to upstreamColin Cross
2018-10-11Merge tag v3.0.0-beta-3 into masterColin Cross
2018-08-03Merge "Suppress clang-analyzer-core.uninitialized.UndefReturn warning." am: a...Chih-hung Hsieh
2018-08-03Merge "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3master-cuttlefish-testing-releaseChih-hung Hsieh
2018-08-03Merge "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."Chih-hung Hsieh
2018-08-03Suppress clang-analyzer-core.uninitialized.UndefReturn warning.Chih-Hung Hsieh
2018-07-24Merge "Add recovery_available: true to libprotobuf-cpp-lite" am: 8f8e27deefTom Cherry
2018-07-24Merge "Add recovery_available: true to libprotobuf-cpp-lite"Tom Cherry
2018-07-24Merge "Add recovery_available: true to libprotobuf-cpp-lite"android-n-iot-release-smart-display-r2Tom Cherry
2018-07-24Add recovery_available: true to libprotobuf-cpp-liteTom Cherry
2018-06-14Merge "Protobuf: Suppress MissingOverride" am: f86b2973c1Andreas Gampe
2018-06-14Merge "Protobuf: Suppress MissingOverride"Andreas Gampe
2018-06-14Merge "Protobuf: Suppress MissingOverride"android-p-preview-5android-p-preview-4android-o-mr1-iot-release-1.0.2android-n-iot-release-smart-displayTreehugger Robot
2018-06-14Protobuf: Suppress MissingOverrideAndreas Gampe
2018-05-18Merge "Add all the internal protos to the java protobuf lib" am: 3146aa7630Julien Desprez
2018-05-18Merge "Add all the internal protos to the java protobuf lib"Julien Desprez
2018-05-18Merge "Add all the internal protos to the java protobuf lib"android-o-mr1-iot-release-1.0.1android-n-iot-release-polk-at1Julien Desprez
2018-05-18Add all the internal protos to the java protobuf libJulien Desprez
2018-05-15Merge "Add SIX to Python-Protobuf dependencies" am: 8d8905924cNan Zhang
2018-05-15Merge "Add SIX to Python-Protobuf dependencies"Nan Zhang
2018-05-15Merge "Add SIX to Python-Protobuf dependencies"Treehugger Robot
2018-05-15Add SIX to Python-Protobuf dependenciesNan Zhang