summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2022-01-10Merge "Snap for 8059228 from d9868039b40b1995f75c8d7ece9df29c7ab3f54d to andr...caf/aosp-new/androidx-media-releaseAndroid Build Coastguard Worker0-0/+0
2022-01-10Snap for 8059228 from d9868039b40b1995f75c8d7ece9df29c7ab3f54d to androidx-me...Android Build Coastguard Worker0-0/+0
2021-08-11Merge "Merge remote-tracking branch 'aosp/androidx-platform-dev-temp' into 19...caf/aosp-new/androidx-window-releasecaf/aosp-new/androidx-wear-watchface-releasecaf/aosp-new/androidx-wear-compose-releasecaf/aosp-new/androidx-resourceinspection-releasecaf/aosp-new/androidx-preference-releasecaf/aosp-new/androidx-metrics-releasecaf/aosp-new/androidx-maincaf/aosp-new/androidx-localbroadcastmanager-releasecaf/aosp-new/androidx-glance-releasecaf/aosp-new/androidx-emoji2-releasecaf/aosp-new/androidx-draganddrop-releasecaf/aosp-new/androidx-core-core-splashscreen-releasecaf/aosp-new/androidx-coordinatorlayout-releasecaf/aosp-new/androidx-compose-material3-releasecaf/aosp-new/androidx-collection-releasecaf/aosp-new/androidx-benchmark-releaseAlan Viverette0-0/+0
2021-08-10Merge remote-tracking branch 'aosp/androidx-platform-dev-temp' into 191673756...Alan Viverette0-0/+0
2021-06-19Merge "Snap for 7473952 from 2ad4efceff02cc7b518a2f9d47ad07a435daad9f to andr...Android Build Coastguard Worker1-0/+2
2021-06-19Snap for 7473952 from 2ad4efceff02cc7b518a2f9d47ad07a435daad9f to androidx-me...Android Build Coastguard Worker1-0/+2
2021-03-05Merge "Suppress inconsistent-missing-override warnings in libprotobuf in cmak...caf/aosp-new/androidx-platform-dev-tempAurimas Liutikas1-0/+2
2021-03-05Merge "Suppress inconsistent-missing-override warnings in libprotobuf in cmak...caf/aosp-new/androidx-wear-wear-ongoing-releasecaf/aosp-new/androidx-recyclerview-releasecaf/aosp-new/androidx-leanback-releasecaf/aosp-new/androidx-core-core-google-shortcuts-releaseAurimas Liutikas1-0/+2
2021-03-04Suppress inconsistent-missing-override warnings in libprotobuf in cmakeAurimas Liutikas1-0/+2
2020-07-21Merge changes Ic235469e,I1a1be361,I9121b112 into androidx-master-dev am: b0e0...Treehugger Robot1-3/+6
2020-07-21Merge "Remove external/protobuf OWNERS for androidx-master-dev" into androidx...Diego Perez1-4/+0
2020-07-21Merge changes Ic235469e,I1a1be361,I9121b112 into androidx-master-devcaf/aosp-new/androidx-transition-releasecaf/aosp-new/androidx-tracing-releasecaf/aosp-new/androidx-savedstate-releasecaf/aosp-new/androidx-print-releasecaf/aosp-new/androidx-media2-media2-widget-releasecaf/aosp-new/androidx-master-releasecaf/aosp-new/androidx-master-devcaf/aosp-new/androidx-exifinterface-releasecaf/aosp-new/androidx-enterprise-releasecaf/aosp-new/androidx-camera-releasecaf/aosp-new/androidx-biometric-releasecaf/aosp-new/androidx-autofill-releaseTreehugger Robot1-3/+6
2020-07-21Merge "Remove external/protobuf OWNERS for androidx-master-dev" into androidx...Diego Perez1-4/+0
2020-07-21Remove external/protobuf OWNERS for androidx-master-devdiegoperez1-4/+0
2020-07-15Not messing around with individual warningsJoe Baker-Malone1-7/+1
2020-07-15Disable some overly-verbose warningsJoe Baker-Malone1-2/+11
2020-07-15Updates BUILD to work in androidx-studio-integrationdiegoperez1-2/+2
2020-04-25Merge "Set min_sdk_version to be part of mainline modules" am: 8ccc54a794caf/aosp-new/androidx-sqlite-inspection-releasecaf/aosp-new/androidx-concurrent-releaseJooyung Han1-0/+1
2020-04-25Merge "Set min_sdk_version to be part of mainline modules"Jooyung 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-emoji-releasecaf/aosp-new/androidx-drawerlayout-releasecaf/aosp-new/androidx-customview-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."Joshua 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