Commit Graph

111592 Commits

Author SHA1 Message Date
Bill Yi
53100dbc0b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 3caf5ab605 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55a5cfc8ee7beac3b81268ef88252961abeb3675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 08:09:27 +00:00
Bill Yi
30583caa75 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 3caf5ab605 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9cecef72695311a23909ab4945d7e451352c699b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 08:08:06 +00:00
Bill Yi
9d8b5bae6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 12d891d823 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42a13822784c9477c351105c7eae9327609be96c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 08:07:58 +00:00
Bill Yi
7062d08e32 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc8d8e568a -s ours am: a0abf344e5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5891cd8459fa3999c7932fe275ecc7e46ca77391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 08:07:14 +00:00
SongFerngWang
30b7bef042 Fix the NullPointException am: 5a4df243f0 am: 5221cb21bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: I6d673502a90eac66c9787c278f5893dbf88e7273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 08:06:53 +00:00
SongFerngWang
4f17ad5140 Fix the NullPointException am: 5a4df243f0 am: fd583a0459
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: Id3236ff87e3a57cba5ee4afdfbb329e2c83fd19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 08:06:25 +00:00
Bill Yi
f26547c7d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: acfe8e05d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6cce8261d060086e0e0c0876db6de6cda784e77c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 08:06:21 +00:00
SongFerngWang
25818d1f60 Fix the NullPointException am: 5a4df243f0 am: 5221cb21bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: Ibf96ed585fd8294bfdcdc9b7351d491515a629bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 08:05:30 +00:00
SongFerngWang
e16e09497e Fix the NullPointException am: 5a4df243f0 am: 07a37c3170
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: I9b6c9fbb81a33721d542f60ea9e10de1187f3b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 08:04:55 +00:00
TreeHugger Robot
90884f3225 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-20 07:40:11 +00:00
Bill Yi
85204b39fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id627f73cebdb6c2192ed74ef77e68381b5342870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:35:58 +00:00
Bill Yi
d32b801680 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I06f07b7b02f0901e7a68bdad53e88608e5e6eb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:35:23 +00:00
Bill Yi
7c822b7534 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac95f3f35ee3d4507c75472ab5b64425f8869236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:33:48 +00:00
Bill Yi
3caf5ab605 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie1defe5780a660c7ab64d607407a7b73de010fa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:31:35 +00:00
Bill Yi
12d891d823 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7fdb09f6363a6ba36ff1907de0146ff7406163a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:30:37 +00:00
Bill Yi
acfe8e05d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f71c7e4723b674fdd5c02c5426584ac4e4db8b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:30:02 +00:00
Bill Yi
a0abf344e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc8d8e568a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I37ac81ec17759a5bc666685ba06f474852d003cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:29:40 +00:00
SongFerngWang
07a37c3170 Fix the NullPointException am: 5a4df243f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: I6b5a37ed0b23adf4cfbec18f105c64f2e5e7c6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:28:04 +00:00
SongFerngWang
5221cb21bd Fix the NullPointException am: 5a4df243f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: Ifcb7bb32737ee460e8ddbcf7730426017fc018db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:28:03 +00:00
SongFerngWang
fd583a0459 Fix the NullPointException am: 5a4df243f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: Icb8aae31d833d27bb64040af296f096471838785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:27:56 +00:00
Bill Yi
4066539cc9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10ea6e14ee85058126a4fedee4265fd4b651e4fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 07:24:43 +00:00
xuezaiyue
ac7318419a Move battery usage files to a separate folder.
Bug: 202118250
Test: presubmit
Change-Id: I21aa58ebc02327849ed2161dbbafcdc806c007f2
2022-06-19 05:59:35 +00:00
Bill Yi
e00a15d95f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0be2cdb059a4b42e7a9f73d91ca859c9832a3bb3
2022-06-18 19:47:16 -07:00
Bill Yi
2652464d7c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I16bb20a52a58676aece02d01575bc32d710f5cd6
2022-06-18 19:29:15 -07:00
Bill Yi
cc8d8e568a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id834260c1bbd63b31793705e5fb0b22838d9d729
2022-06-18 19:24:50 -07:00
Bill Yi
980d88cc0d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8e73269e1f3bd05c9ffbeb56659b9d1bac5aad55
2022-06-18 19:20:22 -07:00
Bill Yi
516cb3d118 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I26753823c3bfc60fcb0bdd88c872c40da02443c3
2022-06-18 19:15:48 -07:00
Bill Yi
2ad6b3dc50 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4b9f222ff3b5267dfcd3b94da51f1a022ea5f87c
2022-06-18 19:02:00 -07:00
Treehugger Robot
fccffe21a3 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2b57ca5c98 -s ours am: 29531e9296 -s ours am: 42a9ac3a7c -s ours am: ba91f1d310 -s ours am: c98831b78c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc2ad9802be3ada076df5fe6d5163e39bede3300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:58:47 +00:00
Xin Li
8d27bb82d4 [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad92 -s ours am: a3ca7b04eb -s ours am: 39dd57ee3a -s ours am: 9f4d399062 -s ours am: 0695895c4b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I66b9f99ab44156ff7d089968361b25a0c95ee5f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:57:50 +00:00
Treehugger Robot
c98831b78c [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2b57ca5c98 -s ours am: 29531e9296 -s ours am: 42a9ac3a7c -s ours am: ba91f1d310 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I9ffb727edf050b30418124367f01388003c6c9ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:33:04 +00:00
Xin Li
0695895c4b [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad92 -s ours am: a3ca7b04eb -s ours am: 39dd57ee3a -s ours am: 9f4d399062 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I6819fa67feae29144c91786a63326ea58d1a22d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:32:04 +00:00
Treehugger Robot
ba91f1d310 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2b57ca5c98 -s ours am: 29531e9296 -s ours am: 42a9ac3a7c -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I45dd030f41ad1d845653d3767bec62fc9cb8bf1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:03:29 +00:00
Xin Li
9f4d399062 [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad92 -s ours am: a3ca7b04eb -s ours am: 39dd57ee3a -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Ibe201c915c050cd35cd4fa3aa45c10f35c8ad431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:02:36 +00:00
Xin Li
3d357d68d9 [automerger skipped] Merge "Merge Android 12 QPR 3" am: a258d7760f -s ours am: 403c3de881 -s ours am: 4642c65d0a -s ours am: 2acfc5cd2e -s ours am: 8119030829 -s ours
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: I955b14a123c354c18ef6e155b7f1afd508d73ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:34:39 +00:00
Xin Li
dd82ecbf93 [automerger skipped] Merge Android 12 QPR 3 am: d6c80bd8e3 -s ours am: 8d42cc939b -s ours am: a073091919 -s ours am: 51b8b7df31 -s ours am: 6fe70cb193 -s ours
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: Ifa7d5e0a45ecf7790ac429b3d871f59d38ffeaf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:33:30 +00:00
Treehugger Robot
42a9ac3a7c [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2b57ca5c98 -s ours am: 29531e9296 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Iff96edc9a2fda29fbeba6650aa1edf54d23ac238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:28:27 +00:00
Xin Li
39dd57ee3a [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad92 -s ours am: a3ca7b04eb -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Ie9f798529f14ac40361f03583c5f2d3acda169e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:27:27 +00:00
Xin Li
8119030829 [automerger skipped] Merge "Merge Android 12 QPR 3" am: a258d7760f -s ours am: 403c3de881 -s ours am: 4642c65d0a -s ours am: 2acfc5cd2e -s ours
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: I3f4f1621ef4642b8b79cc47480d5ec7c8a252d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:53:49 +00:00
Xin Li
6fe70cb193 [automerger skipped] Merge Android 12 QPR 3 am: d6c80bd8e3 -s ours am: 8d42cc939b -s ours am: a073091919 -s ours am: 51b8b7df31 -s ours
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: Ia410cd7e27da934eeda6385aa2f193f2a2af58fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:52:37 +00:00
Treehugger Robot
29531e9296 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2b57ca5c98 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I5992b8ca6c5293098ff6d8f3f5ebfd09415de471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:07:25 +00:00
Xin Li
a3ca7b04eb [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad92 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Ie4d02f376d95fdd7ce9c3c54746e32b3df2f18e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:06:31 +00:00
Xin Li
2acfc5cd2e [automerger skipped] Merge "Merge Android 12 QPR 3" am: a258d7760f -s ours am: 403c3de881 -s ours am: 4642c65d0a -s ours
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: Id2b7c26eef93da3103a5987ac27397ac8f5e535a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 19:57:34 +00:00
Xin Li
51b8b7df31 [automerger skipped] Merge Android 12 QPR 3 am: d6c80bd8e3 -s ours am: 8d42cc939b -s ours am: a073091919 -s ours
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: I341af91e5ee8a61f2ade685d1e503bc0279cbcae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 19:56:19 +00:00
Treehugger Robot
2b57ca5c98 Merge "DO NOT MERGE - Skip SQ3A.220605.009" 2022-06-17 14:29:01 +00:00
Xin Li
25fdacad92 DO NOT MERGE - Skip SQ3A.220605.009
Bug: 236045730
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Change-Id: I7ea531b8f0c9f1adad00b497ae6033531416905d
2022-06-16 22:50:46 -07:00
Xin Li
4642c65d0a [automerger skipped] Merge "Merge Android 12 QPR 3" am: a258d7760f -s ours am: 403c3de881 -s ours
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: I5c7844643c9410751d52a366d2f2aa9c43439035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 00:15:31 +00:00
Xin Li
a073091919 [automerger skipped] Merge Android 12 QPR 3 am: d6c80bd8e3 -s ours am: 8d42cc939b -s ours
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: I1316d5e48662fdcec04c12a98ea2b49ffe090cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 00:14:14 +00:00
Xin Li
403c3de881 [automerger skipped] Merge "Merge Android 12 QPR 3" am: a258d7760f -s ours
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: Ifaac4991da6fbde392ae1e40361c2f7255a6537c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:58:25 +00:00
Xin Li
8d42cc939b [automerger skipped] Merge Android 12 QPR 3 am: d6c80bd8e3 -s ours
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: I53467fc718067f75c246713000941af0d2b8e935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:57:07 +00:00