Commit Graph

800342 Commits

Author SHA1 Message Date
Derek Jedral
d6eff4971c Merge "Fix TrustAgent showing unclear string." into tm-qpr-dev am: a20c6a4cf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970372

Change-Id: I1007d99c24b9d804a8f196ae7ca855e4ff91cd6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:18:42 +00:00
TreeHugger Robot
4b71722f70 Merge changes I0e3aadba,I037a2b2f into tm-qpr-dev am: c5637910b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19557873

Change-Id: Ibc0dd7a62a3111781af71575629c4c7edf2abea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:17:50 +00:00
Automerger Merge Worker
d00ed5594c Merge changes from topic "am-cabd4650c28c44639baf0539bd42a1b6" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f94886869e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 98aafb202d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 209ec03e86 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3e87c7ac0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2095e14bd1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9872f3f3fb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b49177c653 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a24d779ad2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 74c90e1fad -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e0ed756fe -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 956a1710d6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b606d0122 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11862c7b71 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8987b22027 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 74cd47bc20 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 94f715c270 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: cda97418fb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f7141fd55f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fa9d09a4e9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c858aeace -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e195a360f5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ec046d5524 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8c13c9e513 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3d7cbec25 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a628c0e8ae -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 783e70efca -s ours
2022-09-21 23:17:21 +00:00
Bill Yi
6c066d6534 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f94886869e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994818

Change-Id: Ic96dd32de4162ab878f23c6787090dd450f5b641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:16:18 +00:00
Bill Yi
ac4487d361 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 98aafb202d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994818

Change-Id: Ie48e81bcb03f8236962fdc301893652eb17dc50b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:16:12 +00:00
Anton Hansson
153037dbfe Merge "Run additional compat checks for checkapi" am: 6196e669fb am: 335f3fc4d6 am: 151ac18420 am: ac18d1ab5f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2223378

Change-Id: Ifd5e5217aa8f6273a92458cb94aacf9f27dbdef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:15:58 +00:00
Bill Yi
9e901c0a69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 209ec03e86 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994608

Change-Id: Iec0705f7b1e4918563ccfa973a8241a18011deae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:15:52 +00:00
Bill Yi
192941253c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3e87c7ac0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994608

Change-Id: I8a1e73be745f35d0ef3687d1b4107baacf69fea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:15:22 +00:00
Bill Yi
e8129d3b65 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2095e14bd1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994543

Change-Id: I4e48680deaed99f8935263d9f616d50a9674e904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:15:16 +00:00
Bill Yi
24398dbd72 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9872f3f3fb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994543

Change-Id: Ic658ea0b54624683d9d3592ed5b11023e3ee28b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:15:06 +00:00
Bill Yi
8fe9cce114 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b49177c653 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994322

Change-Id: I3c455c831b3b2abc29eecbbd754449fff4c3676d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:14:42 +00:00
Chiachang Wang
859eb1eafa Merge "Remove the restricted user enforcement in getAppExclusionList" am: 11cf828984 am: 5cbf834eef am: 344d20a308 am: cf161fecc6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220584

Change-Id: Ifa1d071d70cc231b7b5faa3630d54025f9e2d2f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:14:35 +00:00
Bill Yi
c69d5d2e5e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a24d779ad2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994322

Change-Id: I95b74550fd43f01fe185b9b0ab418b1572088688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:14:10 +00:00
Bill Yi
fa130de79b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 74c90e1fad -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994279

Change-Id: I7d22926c9b82dc29c2864940ebe56020199e1fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:13:30 +00:00
Bill Yi
4734b8dbd9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e0ed756fe -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994279

Change-Id: Ib63e101794ff91dfe29d635e9da625b30e3357e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:13:07 +00:00
Bill Yi
f8c0823290 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 956a1710d6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994212

Change-Id: Ie8f97195f9b6c469b003932484f4b68cb7d836c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:12:35 +00:00
Bill Yi
bf1f92b281 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b606d0122 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994212

Change-Id: I28357c84cd0456bc1b2ca65465de51487328598a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:12:11 +00:00
Bill Yi
2d04ca00a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11862c7b71 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993906

Change-Id: I81aae117370bdb055a9e8ace428e4dae597d4862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:12:02 +00:00
Mythri Alle
f973b28aa0 Merge "Reland "Don't enable jdwp by default on userdebug builds""" am: f3683fca37 am: a1b0512a78 am: 59afb30fdb am: e14b396e68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217921

Change-Id: I3ad547777dcfaf69718f68ac0c9a1824f06f371f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:12:01 +00:00
Bill Yi
10818c9bcf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8987b22027 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993906

Change-Id: I8904157a31c7d4e6aa7aae2b2ed5099a6949982e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:11:55 +00:00
Bill Yi
ef3f8d6bf7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 74cd47bc20 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993666

Change-Id: Ia8140511720976bc63a991bb4f9bd07779e45fa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:11:39 +00:00
Bill Yi
cf375ad685 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 94f715c270 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993666

Change-Id: I76831db57f0251c979584d44ee210a6f395b9d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:11:33 +00:00
Bill Yi
ae381ccf4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: cda97418fb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993489

Change-Id: I900c0d4912d75aff9f3dd88a041960f8c0cce597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:11:28 +00:00
Bill Yi
8ce1ef023e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f7141fd55f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993489

Change-Id: Id778e7bbe7803f28c8c8ba87b53fe47ac8b624bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:11:19 +00:00
Bill Yi
3efe634b10 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fa9d09a4e9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993488

Change-Id: I6cd7104c4cfdc374b0d1d48ce62d1f5b536f9023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:11:13 +00:00
Bill Yi
5f12f82fb0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c858aeace -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993488

Change-Id: I7549d31fbef9af7edcb52719bd0f335a032f50c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:11:03 +00:00
Bill Yi
a1aca3321f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e195a360f5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993474

Change-Id: Ia3545fe384880a4c042e3da2d3e0203aed22b113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:10:38 +00:00
Bill Yi
529f07f8ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ec046d5524 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993474

Change-Id: I9ff6a1b59fd7f8dedb43e590826a19a4797048e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:09:54 +00:00
Bill Yi
eba1657fe9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8c13c9e513 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992819

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992819

Change-Id: I26d914ede32fc98b452d194a295f417594769594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:09:22 +00:00
Bill Yi
f01e419211 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a628c0e8ae -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992593

Change-Id: I16eef8f3001ec52fa5fd92763550b38741777fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:09:14 +00:00
Bill Yi
82f26db1a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 783e70efca -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992593

Change-Id: I6f72da9ccab70fa76117d05087f9b3c2313e743b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:08:53 +00:00
TreeHugger Robot
f87b038afc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34e4bc07e7 -s ours am: d5596609d9 -s ours am: d4635b31a9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994469

Change-Id: I497173187df77aebb1e64dce93758f7df98c798b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:08:42 +00:00
Bill Yi
c91656243f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2348782a2 -s ours am: da465afb51 -s ours am: f0c1b1f5fd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994469

Change-Id: I3d52515017d2ae24a12c482d4dd09536249b942a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:08:39 +00:00
TreeHugger Robot
1db0d4675c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 075f9ceed2 -s ours am: 67e152dc3a -s ours am: 4611240975 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994273

Change-Id: I13b4339dd89adfa0dc2aed7dde5f2de3b3a27897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:08:20 +00:00
Bill Yi
78b5ea6951 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3429b29ce3 -s ours am: 490995a6cf -s ours am: 075585f872 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994273

Change-Id: I99a7fc71c342f045f3fb83e74e1c1c0dc3fbbfcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:08:17 +00:00
TreeHugger Robot
5e8c21f5c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 55280a3b18 -s ours am: 65232daea8 -s ours am: 422b3c53bc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994264

Change-Id: I9fa16c330dfd47682398d1a94b99bde725e41fe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:07:54 +00:00
Bill Yi
4e4a2c7c31 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c3da8cb0bd -s ours am: 3117257972 -s ours am: 752c2ba73b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19994264

Change-Id: Iae7bdb8c842a31ed33df9eaa9f7452320038b9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:07:48 +00:00
TreeHugger Robot
df57356ad6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e495ec6635 -s ours am: 558d2840d0 -s ours am: fda1597b1d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993890

Change-Id: I8491b2188488f63b70d4186bc703acd9581c9fd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:07:45 +00:00
Bill Yi
0ce49d95a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a0d129a4e -s ours am: e958bd45b6 -s ours am: 43b1c25e78 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993890

Change-Id: Ia475dcb41b5f43c5c027b6cb1537f87ecda66364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:07:30 +00:00
TreeHugger Robot
49b0ddfa35 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 9b4cb6ab33 -s ours am: c924f96241 -s ours am: bb83b15f36 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993764

Change-Id: I5b2166b252d1238df2a022831a9846ee29214f55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:07:27 +00:00
Bill Yi
1e7027a535 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39549af0ee -s ours am: 8aa42b38f1 -s ours am: 8ae70b98a7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993764

Change-Id: I1f67d4fc47ec15556f8dfce12112c4826b51a2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:07:24 +00:00
TreeHugger Robot
6c7a3a891d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b18172156 -s ours am: 028f4ca3e4 -s ours am: 5c2b9f3a53 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993610

Change-Id: Ic1702eaa1393116d4c8d24ecb21d085c8f977b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:07:02 +00:00
Bill Yi
7c1b9a73fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9548c9c54f -s ours am: 339af2b104 -s ours am: c48a4fd0f7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993610

Change-Id: Ibcac3c054af269227c7f38cbc2f8251937149ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:06:58 +00:00
TreeHugger Robot
47100cca89 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e729110c1c -s ours am: 9aa0794c10 -s ours am: 56d3b59152 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992931

Change-Id: Id5f6168e93ff5e56c2abad0457b7076baa197eaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:06:55 +00:00
Bill Yi
85a56b59c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c6f1ef3f16 -s ours am: 603aed67aa -s ours am: 11758a877d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992931

Change-Id: I8044c1a866e243606f95bf862476791d6df520ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:06:38 +00:00
TreeHugger Robot
b650e1f6df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dcd4eaf6d -s ours am: 715397afc1 -s ours am: bbf3f7e37e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992602

Change-Id: I0f3741ed01fb6b7dcf9e69864c4454d1f0d4985d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:06:15 +00:00
Bill Yi
e5e8d737da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 753d359ba4 -s ours am: 3b6eaedf8e -s ours am: 226794a1a6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992602

Change-Id: Idbb5284aa291efe13d4b23a67dc460ef6dcc8471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:06:11 +00:00
TreeHugger Robot
7732f406f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e1ef674e6 -s ours am: 9bced8a258 -s ours am: 5a6418621a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992502

Change-Id: I9ee072f670cc46495d8618c0f889fa5c4dabb21f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:05:55 +00:00
Bill Yi
ddf91037cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c28e97f85 -s ours am: 88eb6e7d47 -s ours am: 1c1eba35dc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992502

Change-Id: I66c7195b92a2b810175d92bc24a4a605fc24875a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:05:37 +00:00