aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Set min_sdk_version to be part of mainline modules"androidx-wear-releaseandroidx-appcompat-releaseJooyung Han2020-04-251-0/+1
|\
| * Set min_sdk_version to be part of mainline modulesJooyung Han2020-04-161-0/+1
|/
* Merge "Move most protoc sources to libprotoc"androidx-swiperefreshlayout-releaseandroidx-slidingpanelayout-releaseandroidx-emoji-releaseandroidx-drawerlayout-releaseandroidx-customview-releaseandroidx-core-releaseTreehugger Robot2020-03-301-75/+37
|\
| * Move most protoc sources to libprotocColin Cross2020-03-271-75/+37
* | Merge "Remove redundant NOTICE symbolic link."Treehugger Robot2020-03-281-1/+0
|\ \ | |/ |/|
| * Remove redundant NOTICE symbolic link.Bob Badour2020-03-251-1/+0
|/
* Merge "Set apex_available property"Jiyong Park2020-03-231-2/+19
|\
| * Set apex_available propertyJiyong Park2020-03-231-2/+19
* | Merge "Fix comment in protobuf METADATA"Haibo Huang2020-03-211-1/+1
|\ \ | |/ |/|
| * Fix comment in protobuf METADATAHaibo Huang2020-03-211-1/+1
|/
* Merge "Set apex_available for libprotobuf-cpp-lite." am: 7428910307android-r-preview-4android-r-preview-3android-r-preview-2androidx-versionedparcelable-releaseAutomerger Merge Worker2020-02-111-0/+5
|\
| * Merge "Set apex_available for libprotobuf-cpp-lite."Joshua Duong2020-02-111-0/+5
| |\
| | * Set apex_available for libprotobuf-cpp-lite.Joshua Duong2020-02-101-0/+5
| |/
* | Merge "CMakeLists for Cross-compiling" am: fcd1d5e3e3Automerger Merge Worker2020-02-072-0/+10
|\|
| * Merge "CMakeLists for Cross-compiling"Treehugger Robot2020-02-072-0/+10
| |\
| | * CMakeLists for Cross-compilingHao Chen2020-02-052-0/+10
| |/
* | Merge "libprotobuf-cpp-lite is removed from VNDK." am: 7a345e6d56Automerger Merge Worker2020-01-241-3/+0
|\|
| * Merge "libprotobuf-cpp-lite is removed from VNDK."android-r-preview-1Jiyong Park2020-01-241-3/+0
| |\
| | * libprotobuf-cpp-lite is removed from VNDK.Jiyong Park2020-01-241-3/+0
| |/
* | Merge "libprotobuf-cpp-full is removed from VNDK."Jiyong Park2020-01-191-3/+0
|\|
| * Merge "libprotobuf-cpp-full is removed from VNDK."Treehugger Robot2020-01-201-3/+0
| |\
| | * libprotobuf-cpp-full is removed from VNDK.Jiyong Park2020-01-171-3/+0
| |/
* | Merge "Define host library for the proto compiler plugins" am: 62da9ea31bAlexander Smundak2019-11-211-2/+29
|\|
| * Merge "Define host library for the proto compiler plugins"bender-v1-stableAlexander Smundak2019-11-211-2/+29
| |\
| | * Merge "Define host library for the proto compiler plugins"Alexander Smundak2019-11-211-2/+29
| | |\
| | | * Define host library for the proto compiler pluginsSasha Smundak2019-11-211-2/+29
| | |/
* | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-300-0/+0
|\| |
| * | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-300-0/+0
| |\ \
* | \ \ Merge "Use full protobuf for libprotobuf-cpp-full" am: b6ad51875e am: f44a31bef1Colin Cross2019-10-281-0/+1
|\ \ \ \
| * | | | Merge "Use full protobuf for libprotobuf-cpp-full" am: b6ad51875eColin Cross2019-10-281-0/+1
| |\| | |
| | * | | Merge "Use full protobuf for libprotobuf-cpp-full"Colin Cross2019-10-281-0/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge "Use full protobuf for libprotobuf-cpp-full"Treehugger Robot2019-10-281-0/+1
| | |/| |
| | | * | Use full protobuf for libprotobuf-cpp-fullColin Cross2019-10-251-0/+1
* | | | | Merge "Remove stale README.version" am: 3bd9ad6d39 am: 4c8cd50a3cPrimiano Tucci2019-10-111-3/+0
|\| | | | | |_|_|/ |/| | |
| * | | Merge "Remove stale README.version" am: 3bd9ad6d39Primiano Tucci2019-10-111-3/+0
| |\| |
| | * | Merge "Remove stale README.version"Primiano Tucci2019-10-111-3/+0
| | |\|
| | | * Merge "Remove stale README.version"Treehugger Robot2019-10-111-3/+0
| | | |\
| | | | * Remove stale README.versionPrimiano Tucci2019-10-111-3/+0
| | | |/
* | | | Merge "libprotobuf_vendor_suffix_test requires root to run." am: 195a9e42db a...Dan Shi2019-09-301-0/+3
|\| | |
| * | | Merge "libprotobuf_vendor_suffix_test requires root to run." am: 195a9e42dbDan Shi2019-09-301-0/+3
| |\| |
| | * | Merge "libprotobuf_vendor_suffix_test requires root to run."Dan Shi2019-09-301-0/+3
| | |\|
| | | * Merge "libprotobuf_vendor_suffix_test requires root to run."ndk-sysroot-r21Treehugger Robot2019-09-301-0/+3
| | | |\
| | | | * libprotobuf_vendor_suffix_test requires root to run.Dan Shi2019-09-301-0/+3
| | | |/
* | | | Merge changes from topic "protobuf-3.9.1" am: 3bc2bb9b29 am: 20b0d10abeColin Cross2019-09-115-0/+98
|\| | |
| * | | Merge changes from topic "protobuf-3.9.1" am: 3bc2bb9b29Colin Cross2019-09-115-0/+98
| |\| |
| | * | Merge changes from topic "protobuf-3.9.1"Colin Cross2019-09-115-0/+98
| | |\|
| | | * Merge changes from topic "protobuf-3.9.1"Colin Cross2019-09-112179-160050/+409442
| | | |\
| | | | * Version vendor libprotobuf-cpp-* librariesColin Cross2019-09-065-0/+98
* | | | | Add missing override to ~GeneratedExtensionFinder() am: ff3160af28 am: 000cad...Colin Cross2019-09-111-1/+1
|\| | | |
| * | | | Add missing override to ~GeneratedExtensionFinder() am: ff3160af28Colin Cross2019-09-111-1/+1
| |\| | |