Commit Graph

813479 Commits

Author SHA1 Message Date
Massimo Carli
4556613637 Merge "Log letterbox persistent positioning" into tm-qpr-dev 2022-12-05 22:34:24 +00:00
John Wu
618162505c Merge "Disable intent filter enforcement in startActivityFromRecents" into tm-qpr-dev am: 1cc6b20282
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20613768

Change-Id: Icff395a595baeeb103673d40d536cb417c5a4377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 22:27:28 +00:00
TreeHugger Robot
9ade968368 Merge "Check signature of updated font during boot" into tm-qpr-dev-plus-aosp 2022-12-05 22:27:00 +00:00
Tracy Zhou
d9afab9aa7 Log stage split exit from split to fullscreen keyboard shortcut
Test: N/A
Fixes: 261461056
Change-Id: Ibd8f668026f8bc191975ad0351727204b4bad2c2
2022-12-05 22:01:29 +00:00
John Wu
f7e8fc97f9 Check if ParsedMainComponent is null before dereferencing
Bug: 240151494
Test: m
Change-Id: I2d225efa747df06cb7513d7ace84a06de67ee895
2022-12-05 21:59:12 +00:00
John Wu
1cc6b20282 Merge "Disable intent filter enforcement in startActivityFromRecents" into tm-qpr-dev 2022-12-05 21:58:12 +00:00
Caitlin Shkuratov
f243434929 [Media TTT] Add a command line option to hide the undo button.
Mostly, this re-factors the Media TTT CLI to be more flexible in
handling any optional arguments.

Bug: 260127537
Test: `adb shell cmd statusbar media-ttt-chip-sender MyTablet
TRANSFER_TO_THIS_DEVICE_SUCCEEDED showUndo=false` -> shows chipbar but
without undo button
Test: Other adb commands with other params (`useAppIcon=false`,
`id=someId`) still work correctly

Change-Id: Iabc5029f6c66d8b348e5b7a224b221f240ec6ce5
2022-12-05 21:56:36 +00:00
David Saff
554c28e496 Merge "Create MemoryTrackingTestCase for convenient heap dumping" into tm-qpr-dev am: 0ff970a960
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20623086

Change-Id: Iefcf76d6ac0f9ddaab53c810fde0735a2b3cdd41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 21:48:29 +00:00
Alison Cichowlas
890741f133 Register VolumeDialogImpl dumpable.
Bug: 232606092
Test: adb shell dumpsys activity service SystemUI | grep VolumeDialogImpl: (including final colon) has results
Change-Id: If15e3c5947b8595d824a21dc9088e3fc9e8636ac
2022-12-05 16:42:44 -05:00
Nicolo' Mazzucato
a29cd25a67 Remove top and bottom parent constraint from album_art as it has a fixed height
As the height is fixed, the bottom constraint is not needed. With the new ConstraintLayout version they were causing a conflict that ended up making the media player with a smaller height.

Bug: 261475673
Test: QSMediaPlayerContent
Change-Id: Ia5373a624e1c597af8d4899f9743672df23c9c88
2022-12-05 21:41:45 +00:00
David Saff
0ff970a960 Merge "Create MemoryTrackingTestCase for convenient heap dumping" into tm-qpr-dev 2022-12-05 21:17:24 +00:00
David Saff
6ae141f73c Create MemoryTrackingTestCase for convenient heap dumping
Test: manual checking with BubblesTest
Change-Id: I74a641e2d4fccff8f9184a05d0c4ce052f5241fa
Bug: 261482343
2022-12-05 21:15:34 +00:00
Caitlin Shkuratov
5791b8a69c Merge "[Tests] Ignore flaky/failing ConfigurationControllerImpl test." into tm-qpr-dev am: 1c79c55c4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20639912

Change-Id: If1dac7cae88577ee4d51b10c4f90edcf87528464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 21:12:39 +00:00
Caitlin Shkuratov
1c79c55c4e Merge "[Tests] Ignore flaky/failing ConfigurationControllerImpl test." into tm-qpr-dev 2022-12-05 20:46:31 +00:00
Treehugger Robot
b3103685b3 Merge "Fix: update Binder#getCallingUidOrWtf to use wtfStack" am: fca208d09a am: 78c06b497f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2328334

Change-Id: I887ced9199677754acff276ad675af4dafec3a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:38:59 +00:00
Automerger Merge Worker
77c0bad190 Merge changes from topic "am-0b23c036d5064a80904345516fd59fe6" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c5d26a301b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31bae2fb8d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 91ee06fe36 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 417a0fbe39 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b7a2770a18 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a7d9d07e60 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 54106c26be -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ef9cc4fc7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9f37c3f02a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d07dcaab2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1a098f4c69 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a55b90492a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 153ccc8f0d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 45975e375c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 488b21074c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dab164d578 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 12fe5b2ff4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77517f453a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1a949d81d0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dbd7a9aa69 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c7221171cf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08c0393ee7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e9baa9d67d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac25947d63 -s ours
2022-12-05 20:37:47 +00:00
Gareth Vaughan
ea92279306 Fixing test that is breaking in some environments. am: 735a3d612d am: 2b54e1af5b am: 4cfed2aea9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20618518

Change-Id: I64c3112a0dfb6d19104edfbb15d123bb524b6a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:36:56 +00:00
Bill Yi
eb964f1d34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c5d26a301b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ddf95e1d17aa430076c027c12ad9cb20aa3947c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:36:48 +00:00
Bill Yi
6a64e96093 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31bae2fb8d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I860bf7fbdbf45f476abdfbeaff1438a244d81139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:36:39 +00:00
Bill Yi
e4edc6952b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 91ee06fe36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id95b47fae7b46f02b9a51669c65544686afd17d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:36:31 +00:00
Bill Yi
5af4b4c34c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 417a0fbe39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc99fd69c0240d8f384d76cdb64c018768d0a2c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:36:11 +00:00
Bill Yi
466d7814e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b7a2770a18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91353d31f00580ac4fb014f2686589d6779092ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:35:57 +00:00
Bill Yi
2ec8256e28 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a7d9d07e60 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I58c533ea653615d2040afb19d19d14821edb6ed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:35:49 +00:00
Bill Yi
2dcaffdcc7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 54106c26be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I06bcac9e0b83db5db21c4b16b15e2899ce700738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:35:19 +00:00
Bill Yi
f6c010a0c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ef9cc4fc7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ca98f66f1db1ad025e7537e05ff741bcf1a6554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:34:55 +00:00
Bill Yi
6170a1e78b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9f37c3f02a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I27c0d037d2d53398e3be52faa78161ef0bde2a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:34:49 +00:00
Bill Yi
ecad0cdacb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d07dcaab2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie9066de00d5deeda902a8f530a81200fda2d4f90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:34:26 +00:00
Bill Yi
88404e97d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1a098f4c69 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I126e59987a1876ad7e38cfd1a520dfcf8b248bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:34:01 +00:00
Bill Yi
6c1f22d54b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a55b90492a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f2205418ec25f3963fb8acd3ad923ba4d094208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:33:43 +00:00
Aaron Liu
9271f66c37 [Bouncer] Remove margin top for bouncer view.
The bouncer view has a slight scroll feedback with touch and clips the children when scrolled up too far.
This is because of a parent container that has another child and has a margin top. I have moved the bouncer view
to the root view. This is fine because the sibling keyguard message area
is now only used when bouncer is not showing. Additionally I took the
sum of those margins and set it as the padding top in the view binder.

Fixes: 260477609
Test: Open bouncer.
Change-Id: Icdf5a314115693d9f7188971adba1396dac105e6
2022-12-05 12:33:34 -08:00
Bill Yi
d9b74f750e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 153ccc8f0d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e73862f76564527578a739eeee132ff01ab4f25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:33:21 +00:00
Bill Yi
bb669a9135 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 45975e375c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28a4e5803ea852cd353baa63ec4ab3b303ace318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:33:00 +00:00
Bill Yi
f09e708dbe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 488b21074c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia64d15fd4e3b6d23b828931c35cb8bb4875799cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:32:53 +00:00
Bill Yi
d30bfb0378 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dab164d578 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9979135338d363817be691b08923dd76da20c996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:32:35 +00:00
Bill Yi
4fdb65bcee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 12fe5b2ff4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If898dd228f09122dccf0e03426b3525d2e128e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:32:25 +00:00
Bill Yi
85ee015e07 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77517f453a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46061ed833c79958f3cdd0fbfb628c76e17e1fbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:32:11 +00:00
Bill Yi
126763fe81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1a949d81d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee5430ba52f1b07f809604e1116846e9d72ba5a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:31:50 +00:00
Bill Yi
58098cad46 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dbd7a9aa69 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic8d70e46a98e97dc8dbf85782c547dd14589fdaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:31:16 +00:00
Bill Yi
4e8ccb9fae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c7221171cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I285632b1c9e7d1654ea7de312001b90195136728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:31:08 +00:00
Bill Yi
3709ae2dd3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08c0393ee7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2720d0f0dc44a8d3cbf71dc0e45501ec2662efda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:30:46 +00:00
Bill Yi
deb3f68544 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e9baa9d67d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3bafb45105ddea1a8b0678ce184d9aee82931eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:30:25 +00:00
Bill Yi
29240997dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac25947d63 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I81a0cca7712a01d1392d1ad029b798be1e385e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:29:55 +00:00
Treehugger Robot
78c06b497f Merge "Fix: update Binder#getCallingUidOrWtf to use wtfStack" am: fca208d09a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2328334

Change-Id: Ia196827c5c7843939d09caf7cc0d45a7996a4602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:03:07 +00:00
Gareth Vaughan
4cfed2aea9 Fixing test that is breaking in some environments. am: 735a3d612d am: 2b54e1af5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20618518

Change-Id: Ibef15a4882f3696417fb1c95d3bdd3bc6fff4860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 19:57:49 +00:00
Kenneth Ford
e742c1defa Continue searching for device state after exception
Instead of returning if a sensor value hasn't returned
we continue to look for a state that satisfy's
the current device configuration.

This fixes scenarios where some sensors return values
much faster than others on startup, and certain
states may have their conditions met.

Bug: 257292818
Test: Manual
Change-Id: I1796a682f0fa82ab9cba39e496369f59fd9c5721
2022-12-05 19:50:06 +00:00
Lucas Silva
9a202be8e4 Move condition logic to shared lib so it can be reused in DockSetup apk
This will help make the conditional code in DockSetup more scalable

Bug: 259724339
Test: mp droid
Change-Id: I3822ebbe3fcf6a3f0db65465b83932cd48dd9732
2022-12-05 14:44:11 -05:00
Michal Brzezinski
c4c5987b65 Making sure QS are visible when expanding shade with heads-up notification
QS was not visible because we were not updating QS expansion when heads up notification motion was in progress. Now we will do it when swiping down, so after going below starting movement position.

Fixes: 259447896
Test: show heads up notification -> swipe down on it -> QS should be visible throughout the whole down motion
Change-Id: Id54d7ac289fdd5bb527d9aa985e2bff90c4a4307
2022-12-05 19:41:35 +00:00
Bill Yi
d8302b3f01 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a060b2f983 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I72728d4f132a71cfa2751266b6a5416e16b6969f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 19:30:01 +00:00
Bill Yi
9b7344764a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 436b6dd026 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iefcfb3b09fb64246cad7db59d94d199fe5a00f64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 19:29:51 +00:00
Bill Yi
7e7b117357 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: caa3af02a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia4211ba40d51521fb69a70b6fde12652372462f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 19:29:41 +00:00