Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,152 Commits 1 Branch 0 Tags
131913f877bbd26c59a64f95d863c88320cf4e1c
Commit Graph

110152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
d761c73acc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: ff2b23ea95 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0b0636ca76fa53ce38ae420649762ae595a9817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:31:04 +00:00
Bill Yi
ea0084439d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: 0928d5bbaf -s ours am: 3bebde58b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e598355f3cd878d3b748b2175c7e85014233d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:31:02 +00:00
Bill Yi
e744ffb618 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: efa32dc352 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d5074d89fe27ab8fef33632a8702f445d67c6d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:30:49 +00:00
Bill Yi
607d34f0ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: efa32dc352 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e3283ba4d39bd8aaae31c0e5b7729b0cc4c81e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:30:49 +00:00
Bill Yi
e910d1943b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: 0e38635a4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I24710e07473821fc74eb2d370ac26176de7df766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:18:56 +00:00
Bill Yi
772476e65c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: d267bd8655 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98390769e2d8ddb0719c12572ff8a5d259d35813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:18:46 +00:00
Bill Yi
3bebde58b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: 0928d5bbaf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41745572c2e4d6e629f639c930d43f524c79ecfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:18:30 +00:00
Bill Yi
0e38635a4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfedb5270e175e11962cea5feac0186c754eaa2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:55:44 +00:00
Bill Yi
e0c74c9f4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia18bb4a94e58e722ee81f58210eef4c306a72bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:55:41 +00:00
Bill Yi
d267bd8655 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icfb4d78c4245679bc0c62b696e23263a9183d353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:55:34 +00:00
Bill Yi
ff2b23ea95 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iffe1907092d830d4395f8292069529c448ec88ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:55:30 +00:00
Bill Yi
0928d5bbaf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd385a535680b4674adc83a4650cc86f8be59192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:55:18 +00:00
Bill Yi
efa32dc352 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c2c7fa020fb3bb13fd41213e92fcb8b4d8683b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:55:15 +00:00
Bill Yi
dbe25724d6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-09-27 17:11:14 +00:00
Bill Yi
c920993671 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If4efd7d3316b1782c9e502c75284a753fc9d692d
 2022-09-27 10:00:16 -07:00
Ats Jenk
6d69676059 Merge "Add support to hide developer tile based on a flag" into tm-qpr-dev am: f1807d897b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20031235

Change-Id: I9715ad0b620212e08d4d2f744d17c12da26b26e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 16:19:51 +00:00
Ats Jenk
f1807d897b Merge "Add support to hide developer tile based on a flag" into tm-qpr-dev 2022-09-27 15:52:37 +00:00
ot904699
aa76620073 Fix USB OTG hot plug out nndexOutOfBoundsException 
Open Settings, then open Storage , plug in USB OTG with Disk, select Disk, open Files, play a video, press the back key, hot plug out USB OTG, the IndexOutOfBoundsException will happen

The root cause is when received the onVolumeStateChanged in StorageEventListener in StorageDashboardFragment, the volumeInfo
status is VolumeInfo.STATE_UNMOUNTED or VolumeInfo.STATE_EJECTING, mSelectedStorageEntry set to changedStorageEntry, cause the fail.

This is a fix for CL 225095144 bug.

Bug: 247737688
Test: Manual

Change-Id: I9535c49d65c42a8dfa8ccf4e271ae973d944d4b9
 2022-09-26 08:15:48 +00:00
Automerger Merge Worker
8b698d46a3 Merge changes from topic "am-44884482f39c4e5bb8e97e19df49f3d8" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours am: 9ef4f7bf83 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours am: 49e8ae680f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours am: db81d7d5ab -s ours
 2022-09-26 06:07:09 +00:00
TreeHugger Robot
211ffb5d1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours am: 6b68056ab6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I969e49c03907bfa3ee03dc2e0717a01dc0440f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:39 +00:00
TreeHugger Robot
bdb77f2c7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours am: 9ef4f7bf83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf02d341caf3a6c50cbfd12a73ef11dc512f2089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:33 +00:00
Bill Yi
e5efbb0e5e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours am: c802b51978 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c876af69d65c5e9be7e72684a5fa2c71c6975cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:26 +00:00
Bill Yi
637f8bdd5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours am: 49e8ae680f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09117dde481df49ff57a2da477d2e9fa6a3d33a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:22 +00:00
Bill Yi
359712a426 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours am: 44c4eadbd3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba0ff644ef6e947c69e0270ecdd78511e970bff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:15 +00:00
Bill Yi
4220e27e3d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours am: db81d7d5ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f6a1b7a1fea9fab71a46f0d8163dcbc909724ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:06 +00:00
TreeHugger Robot
6b68056ab6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia8d350fd3268d547a91f443b245742a77b3aa594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:43:09 +00:00
Bill Yi
c802b51978 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3fae5f4eb9984d9fe3aadee1ce847067d59753d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:43:03 +00:00
Bill Yi
44c4eadbd3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a66f517313d9543447a17e62d063c0c9b233238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:42:39 +00:00
TreeHugger Robot
9ef4f7bf83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5682881041e0d914cf81c26b1244924458b7637c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:41:56 +00:00
Bill Yi
49e8ae680f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I717c9a7a099ce59ac3487d09b50e0bf620b76dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:41:46 +00:00
Bill Yi
db81d7d5ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49d728662f4953943c069d486d3345d02a7fd1da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:41:29 +00:00
TreeHugger Robot
83ffbfacbc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-09-26 05:13:10 +00:00
Bill Yi
d4accc6881 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e -s ours am: 1b68f107cf -s ours am: 9c58f1e6d5 -s ours am: 9e24f47b92 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd7e614320e4a387d8192731b10375c304d42002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:08:38 +00:00
Bill Yi
9f6069250c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94 -s ours am: fa5c30b611 -s ours am: fc1eb27c1c -s ours am: cf6bdfbf1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9d9691802dd0465946c6b6c8b2f74b9c22f474b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:08:22 +00:00
Bill Yi
a15d043618 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294 -s ours am: 44f10293dd -s ours am: 687ba7a903 -s ours am: 3f81e0c4f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2edddad61a1db601cf779c1f2930783aa1988698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:08:01 +00:00
Bill Yi
093f59ea7b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886 -s ours am: b9925d6346 -s ours am: 7687eee85f -s ours am: 99dffa3013 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a5a0d35bca900dfaec8e19f2b123e374ccb2dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:07:38 +00:00
Bill Yi
9e24f47b92 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e -s ours am: 1b68f107cf -s ours am: 9c58f1e6d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3d18979de5a6edcafa9c9873842f192e5bc2fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:02:43 +00:00
Bill Yi
cf6bdfbf1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94 -s ours am: fa5c30b611 -s ours am: fc1eb27c1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64e785ee741a47e1852645b5013c9cf5f9fc9977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:02:28 +00:00
Bill Yi
3f81e0c4f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294 -s ours am: 44f10293dd -s ours am: 687ba7a903 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3b007c53d6692c289c3cc4205b709d8fe64a6fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:02:08 +00:00
Bill Yi
99dffa3013 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886 -s ours am: b9925d6346 -s ours am: 7687eee85f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3133d34aed69f46827676b1ebd82930caa98b8d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:01:46 +00:00
Bill Yi
9c58f1e6d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e -s ours am: 1b68f107cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I220d0e40fe818db047ad044eaebf353b4c3a9453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:41:25 +00:00
Bill Yi
fc1eb27c1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94 -s ours am: fa5c30b611 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia71f310fee9bcaacc1a85cbdfa67d4a7410753b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:41:10 +00:00
Bill Yi
687ba7a903 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294 -s ours am: 44f10293dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic109f908fef58e17b1d2bcd2538f33140bcd5330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:40:50 +00:00
Bill Yi
7687eee85f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886 -s ours am: b9925d6346 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie1172379e741d3e5062ea530ad2ef3af7cd44ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:40:25 +00:00
Bill Yi
1b68f107cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39d93229b5aa9287c75457e4ff245d24a028b157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:24:36 +00:00
Bill Yi
fa5c30b611 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84b37db6b17af0d646b7855a3e2243ef4b917dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:24:19 +00:00
Bill Yi
44f10293dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id841745bd202fd7524b6707bd44260d4160cc22c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:23:59 +00:00
Bill Yi
b9925d6346 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41d225d2cf538ae26bdfc4a8a0aa65fddc36c8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:23:36 +00:00
Bill Yi
5419d3f04e Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-26 03:07:25 +00:00
Bill Yi
2a57051294 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-26 03:07:25 +00:00