app_Settings

Go to file

Bill Yi 76798cd54a [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e -s ours am: 46cde30768 -s ours am: fe8f27e508 -s ours

am skip reason: Change-Id I5c0fe4b0b3be7191d42db14195791d8a8bee503c with SHA-1 91286c4ec9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12579472

Change-Id: Id398169928129db8dee129867cdd0664c02f7fa6

2020-09-14 22:20:14 +00:00

libs

…

protos

…

res

Import translations. DO NOT MERGE ANYWHERE

2020-09-11 14:36:20 +00:00

src/com/android/settings

Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9 am: 368ae3f9b9

2020-09-12 03:02:52 +00:00

tests