aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-04-07Merge "Merge cherrypicks of [1280289, 1280290, 1280291, 1281232, 1281233, 128...snap-temp-L95400000731027645snap-temp-L86600000600203557snap-temp-L73900000674721054snap-temp-L62100000674737214snap-temp-L56500000675461586snap-temp-L13100000674277159android-build-prod (mdb)
2020-04-07Merge cherrypicks of [1280289, 1280290, 1280291, 1281232, 1281233, 1280216, 1...android-build-prod (mdb)
2020-04-07Merge "Update Preference to version 1.1.1" into snap-temp-L36300000520764128android-build-prod (mdb)
2020-04-07Merge "Add -ktx mirrored dependencies to preference-ktx" into snap-temp-L3630...android-build-prod (mdb)
2020-04-07Update Preference to version 1.1.1Ian Lake
2020-04-07Add -ktx mirrored dependencies to preference-ktxIan Lake
2020-04-07Merge "Update preferences to depend on Fragment 1.2.4" into snap-temp-L363000...android-build-prod (mdb)
2020-04-07Update preferences to depend on Fragment 1.2.4Ian Lake
2020-04-07Merge "Use correct layout inflater in PreferenceDialogFragment" into snap-tem...android-build-prod (mdb)
2020-04-07Use correct layout inflater in PreferenceDialogFragmentJeremy Woods
2020-04-07Merge "Update preferences to Fragment 1.2.3 prebuilts" into snap-temp-L363000...android-build-prod (mdb)
2020-04-07Update preferences to Fragment 1.2.3 prebuiltsJeremy Woods
2020-04-07Merge "Merge cherrypicks of [1280724, 1280725, 1280726] into androidx-prefere...snap-temp-L67600000520597478android-build-prod (mdb)
2020-04-07Merge cherrypicks of [1280724, 1280725, 1280726] into androidx-preference-rel...android-build-prod (mdb)
2020-04-07Merge "Fixes merge conflicts of aosp/980467 into androidx-preference-release"...android-build-prod (mdb)
2020-04-07Fixes merge conflicts of aosp/980467 into androidx-preference-releaseJake Wharton
2020-04-07Merge "Resolve merge conflicts for aosp/1101812 when cherry-picking into aosp...android-build-prod (mdb)
2020-04-07Resolve merge conflicts for aosp/1101812 when cherry-picking into aosp-androi...Nick Anthony
2020-04-07Merge "Fix merge conflicts of aosp/1092414 into androidx-preference-release" ...android-build-prod (mdb)
2020-04-07Fix merge conflicts of aosp/1092414 into androidx-preference-releaseJeff Gaston
2019-08-22Merge "Merge cherrypicks of [1106338] into androidx-preference-release" into ...snap-temp-L82600000520258623snap-temp-L78100000520197215snap-temp-L71700000520217718snap-temp-L67200000520184489snap-temp-L61900000517047934snap-temp-L27000000517066417snap-temp-L26400000517962287snap-temp-L19400000520223374snap-temp-L16400000520265592snap-temp-L15600000520208830snap-temp-L09700000517037531android-build-prod (mdb)
2019-08-22Merge cherrypicks of [1106338] into androidx-preference-releaseandroid-build-prod (mdb)
2019-08-22Merge "Placed build info files in their own directory" into snap-temp-L983000...android-build-prod (mdb)
2019-08-22Placed build info files in their own directorySam Gilbert
2019-08-21Merge "Merge cherrypicks of [1106192] into androidx-preference-release" into ...android-build-prod (mdb)
2019-08-21Merge cherrypicks of [1106192] into androidx-preference-releaseandroid-build-prod (mdb)
2019-08-21Merge "Update Preference version to 1.1.0" into snap-temp-L11300000356669832android-build-prod (mdb)
2019-08-21Update Preference version to 1.1.0Louis Pullen-Freilich
2019-07-21Merge "Merge cherrypicks of [1088705, 1088707, 1088708] into androidx-prefere...android-build-prod (mdb)
2019-07-21Merge cherrypicks of [1088705, 1088707, 1088708] into androidx-preference-rel...android-build-prod (mdb)
2019-07-21Merge "Ignore test configuration dependencies in build_info files" into snap-...android-build-prod (mdb)
2019-07-21Merge "Add requiresSameVersion to LibraryBuildInfoFiles" into snap-temp-L7090...android-build-prod (mdb)
2019-07-21Ignore test configuration dependencies in build_info filesNick Anthony
2019-07-21Merge "Add project directory path to build info files" into snap-temp-L709000...android-build-prod (mdb)
2019-07-21Add requiresSameVersion to LibraryBuildInfoFilesNick Anthony
2019-07-21Add project directory path to build info filesNick Anthony
2019-07-09Merge "Merge cherrypicks of [1012569] into androidx-preference-release" into ...android-build-prod (mdb)
2019-07-09Merge cherrypicks of [1012569] into androidx-preference-releaseandroid-build-prod (mdb)
2019-07-09Merge "Change generated json variable name from "Artifacts" to "artifacts"" i...android-build-prod (mdb)
2019-07-09Change generated json variable name from "Artifacts" to "artifacts"Oussama Ben Abdelbaki
2019-06-27Merge "Snap for 5684219 from c74a472769c8a119bb8b8c5ae318a2ed31216444 to andr...android-build-prod (mdb)
2019-06-27Snap for 5684219 from c74a472769c8a119bb8b8c5ae318a2ed31216444 to androidx-pr...android-build-prod (mdb)
2019-06-24Merge "Revert "Generate Javadoc with Dokka"" into androidx-master-devAndrea Falcone
2019-06-24Merge "Move Exifinterface to beta for July 2nd Release" into androidx-master-devTreehugger Robot
2019-06-24Merge "Update preference to 1.1.0-rc01" into androidx-master-devNick Anthony
2019-06-24Merge "Update appcompat to 1.1.0-rc01" into androidx-master-devNick Anthony
2019-06-24Merge "Update vectordrawable to 1.1.0-rc01" into androidx-master-devNick Anthony
2019-06-24Merge "Change drawArc parameters to be in degrees instead of radians" into an...Nader Jawad
2019-06-24Merge changes I84303e84,If7ed7bfa into androidx-master-devTreehugger Robot
2019-06-24Change drawArc parameters to be in degrees instead of radiansNader Jawad