aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge changes Ic235469e,I1a1be361,I9121b112 into androidx-master-devandroidx-tracing-releaseandroidx-startup-releaseandroidx-mediarouter-releaseandroidx-media2-releaseandroidx-media2-media2-widget-releaseandroidx-media-releaseandroidx-master-releaseandroidx-master-devandroidx-hilt-releaseandroidx-exifinterface-releaseandroidx-datastore-releaseTreehugger Robot2020-07-211-3/+6
|\
| * Not messing around with individual warningsJoe Baker-Malone2020-07-151-7/+1
| * Disable some overly-verbose warningsJoe Baker-Malone2020-07-151-2/+11
| * Updates BUILD to work in androidx-studio-integrationdiegoperez2020-07-151-2/+2
* | Merge "Remove external/protobuf OWNERS for androidx-master-dev" into androidx...Diego Perez2020-07-211-4/+0
|\ \ | |/ |/|
| * Remove external/protobuf OWNERS for androidx-master-devdiegoperez2020-07-211-4/+0
|/
* Merge "Set min_sdk_version to be part of mainline modules" am: 8ccc54a794androidx-work-releaseandroidx-webkit-releaseandroidx-sqlite-releaseandroidx-sqlite-inspection-releaseandroidx-navigation-releaseandroidx-concurrent-releaseJooyung Han2020-04-251-0/+1
|\
| * 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
| |/
* | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
|\ \
| * \ Merge "Move most protoc sources to libprotoc" am: df8e697966 am: 9a004f6509Treehugger Robot2020-03-301-75/+37
| |\ \ | |/ / |/| |
* | | Merge "Move most protoc sources to libprotoc" am: df8e697966Treehugger Robot2020-03-301-75/+37
|\ \ \ | | |/ | |/|
| * | 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." am: 9f9e597a06 am: 71dbd4fd4eTreehugger Robot2020-03-281-1/+0
| | | |\ | |_|_|/ |/| | |
* | | | Merge "Remove redundant NOTICE symbolic link." am: 9f9e597a06Treehugger Robot2020-03-281-1/+0
|\| | |
| * | | 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" am: 6645f5c5d0 am: cd3ff8ace1Jiyong Park2020-03-231-2/+19
| | |\ | |_|/ |/| |
* | | Merge "Set apex_available property" am: 6645f5c5d0Jiyong Park2020-03-231-2/+19
|\| |
| * | 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" am: 575bb1eeeb am: e3b9a2ce3dHaibo Huang2020-03-211-1/+1
| | | |\ | |_|_|/ |/| | |
* | | | Merge "Fix comment in protobuf METADATA" am: 575bb1eeebHaibo Huang2020-03-211-1/+1
|\| | |
| * | | Merge "Fix comment in protobuf METADATA"Haibo Huang2020-03-211-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix comment in protobuf METADATAHaibo Huang2020-03-211-1/+1
| |/ /
| | * DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-maste...Xin Li2020-03-190-0/+0
| | |\ | |_|/ |/| |
* | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
|\ \ \ | |/ / |/| / | |/
| * Merge "Set apex_available for libprotobuf-cpp-lite." am: 7428910307 am: 24761...Automerger Merge Worker2020-02-111-0/+5
| |\ | |/ |/|
* | 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: fcd1d5e3e3 am: 3f23491f86Automerger Merge Worker2020-02-072-0/+10
| | |\ | |_|/ |/| |
* | | 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
| |/ /
| | * [automerger skipped] Merge "libprotobuf-cpp-lite is removed from VNDK." am: 7...Automerger Merge Worker2020-01-240-0/+0
| | |\ | |_|/ |/| |
* | | 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
| |/ /
| | * libprotobuf-cpp-lite is removed from VNDK.Jiyong Park2020-01-231-3/+0
| | * Merge "libprotobuf-cpp-full is removed from VNDK." am: 2f9cf7711d am: cc8260dd79Automerger Merge Worker2020-01-201-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
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-08 23:20:44 +0000