summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2020-04-25Merge "Set min_sdk_version to be part of mainline modules" am: 8ccc54a794caf/aosp-new/mastercaf/aosp-new/androidx-work-releasecaf/aosp-new/androidx-webkit-releasecaf/aosp-new/androidx-sqlite-releasecaf/aosp-new/androidx-sqlite-inspection-releasecaf/aosp-new/androidx-navigation-releasecaf/aosp-new/androidx-master-devJooyung Han1-0/+1
2020-04-25Merge "Set min_sdk_version to be part of mainline modules"caf/aosp-new/androidx-wear-releasecaf/aosp-new/androidx-appcompat-releaseJooyung Han1-0/+1
2020-04-16Set min_sdk_version to be part of mainline modulesJooyung Han1-0/+1
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li0-0/+0
2020-03-30Merge "Move most protoc sources to libprotoc" am: df8e697966 am: 9a004f6509Treehugger Robot1-75/+37
2020-03-30Merge "Move most protoc sources to libprotoc" am: df8e697966Treehugger Robot1-75/+37
2020-03-30Merge "Move most protoc sources to libprotoc"caf/aosp-new/androidx-swiperefreshlayout-releasecaf/aosp-new/androidx-slidingpanelayout-releasecaf/aosp-new/androidx-emoji-releasecaf/aosp-new/androidx-drawerlayout-releasecaf/aosp-new/androidx-customview-releasecaf/aosp-new/androidx-core-releasecaf/aosp-new/androidx-camerax-releaseTreehugger Robot1-75/+37
2020-03-28Merge "Remove redundant NOTICE symbolic link." am: 9f9e597a06 am: 71dbd4fd4eTreehugger Robot1-1/+0
2020-03-28Merge "Remove redundant NOTICE symbolic link." am: 9f9e597a06Treehugger Robot1-1/+0
2020-03-28Merge "Remove redundant NOTICE symbolic link."Treehugger Robot1-1/+0
2020-03-27Move most protoc sources to libprotocColin Cross1-75/+37
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour1-1/+0
2020-03-23Merge "Set apex_available property" am: 6645f5c5d0 am: cd3ff8ace1Jiyong Park1-2/+19
2020-03-23Merge "Set apex_available property" am: 6645f5c5d0Jiyong Park1-2/+19
2020-03-23Merge "Set apex_available property"Jiyong Park1-2/+19
2020-03-23Set apex_available propertyJiyong Park1-2/+19
2020-03-21Merge "Fix comment in protobuf METADATA" am: 575bb1eeeb am: e3b9a2ce3dHaibo Huang1-1/+1
2020-03-21Merge "Fix comment in protobuf METADATA" am: 575bb1eeebHaibo Huang1-1/+1
2020-03-21Merge "Fix comment in protobuf METADATA"Haibo Huang1-1/+1
2020-03-21Fix comment in protobuf METADATAHaibo Huang1-1/+1
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-maste...Xin Li0-0/+0
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li0-0/+0
2020-02-11Merge "Set apex_available for libprotobuf-cpp-lite." am: 7428910307 am: 24761...Automerger Merge Worker1-0/+5
2020-02-11Merge "Set apex_available for libprotobuf-cpp-lite." am: 7428910307android-r-preview-4android-r-preview-3android-r-preview-2caf/aosp-new/androidx-versionedparcelable-releaseAutomerger Merge Worker1-0/+5
2020-02-11Merge "Set apex_available for libprotobuf-cpp-lite."caf/aosp-new/androidx-g3-releaseJoshua Duong1-0/+5
2020-02-10Set apex_available for libprotobuf-cpp-lite.Joshua Duong1-0/+5
2020-02-07Merge "CMakeLists for Cross-compiling" am: fcd1d5e3e3 am: 3f23491f86Automerger Merge Worker2-0/+10
2020-02-07Merge "CMakeLists for Cross-compiling" am: fcd1d5e3e3Automerger Merge Worker2-0/+10
2020-02-07Merge "CMakeLists for Cross-compiling"Treehugger Robot2-0/+10
2020-02-05CMakeLists for Cross-compilingHao Chen2-0/+10
2020-01-24[automerger skipped] Merge "libprotobuf-cpp-lite is removed from VNDK." am: 7...Automerger Merge Worker0-0/+0
2020-01-24Merge "libprotobuf-cpp-lite is removed from VNDK." am: 7a345e6d56Automerger Merge Worker1-3/+0
2020-01-24Merge "libprotobuf-cpp-lite is removed from VNDK."android-r-preview-1Jiyong Park1-3/+0
2020-01-24libprotobuf-cpp-lite is removed from VNDK.Jiyong Park1-3/+0
2020-01-23libprotobuf-cpp-lite is removed from VNDK.Jiyong Park1-3/+0
2020-01-20Merge "libprotobuf-cpp-full is removed from VNDK." am: 2f9cf7711d am: cc8260dd79Automerger Merge Worker1-3/+0
2020-01-19Merge "libprotobuf-cpp-full is removed from VNDK."Jiyong Park1-3/+0
2020-01-20Merge "libprotobuf-cpp-full is removed from VNDK."Treehugger Robot1-3/+0
2020-01-17libprotobuf-cpp-full is removed from VNDK.Jiyong Park1-3/+0
2019-11-21Merge "Define host library for the proto compiler plugins" am: 62da9ea31bAlexander Smundak1-2/+29
2019-11-21Merge "Define host library for the proto compiler plugins"bender-v1-stableAlexander Smundak1-2/+29
2019-11-21Merge "Define host library for the proto compiler plugins"Alexander Smundak1-2/+29
2019-11-21Define host library for the proto compiler pluginsSasha Smundak1-2/+29
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li0-0/+0
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li0-0/+0
2019-10-28Merge "Use full protobuf for libprotobuf-cpp-full" am: b6ad51875e am: f44a31bef1Colin Cross1-0/+1
2019-10-28Merge "Use full protobuf for libprotobuf-cpp-full" am: b6ad51875eColin Cross1-0/+1
2019-10-28Merge "Use full protobuf for libprotobuf-cpp-full"Colin Cross1-0/+1
2019-10-28Merge "Use full protobuf for libprotobuf-cpp-full"Treehugger Robot1-0/+1
2019-10-25Use full protobuf for libprotobuf-cpp-fullColin Cross1-0/+1