Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
654,180 Commits 3 Branches 0 Tags
129bbf0b6865c19bde798db1cebca3cd9d604478
Commit Graph

654180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c265832014 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ddd769d0d6 -s ours am: 48411fcd34 -s ours am: 6ce048e329 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I398388bca8ead5e4edcf113297815aa39a551a09
 2021-08-10 22:44:08 +00:00
Automerger Merge Worker
50c7797637 Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: Ia7b043f41c17732d468dc64daa819d978d1e2650
 2021-08-10 22:42:49 +00:00
Dave Mankoff
a540241260 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: Ia83a72319614bb3cf3f94caab49f4581c89374e4
 2021-08-10 22:42:41 +00:00
Michael Groover
57244b6ebb Merge "Create new instance of shared lineage signers to preserve capabilities" into sc-dev am: 71f64ff1ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15508291

Change-Id: I1090c0fc89ba68ff8c20411dd35d27692b560de0
 2021-08-10 22:36:04 +00:00
TreeHugger Robot
ca4e09d0c1 Merge changes I7a3ba2af,Ifa89ae43 into sc-dev am: 0f1dd468bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15504100

Change-Id: I398b961956a7c0b06b37784aca6ff870739f7900
 2021-08-10 22:35:00 +00:00
Michael Groover
a13fd1a4db Merge "Create new instance of shared lineage signers to preserve capabilities" into sc-dev am: 71f64ff1ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15508291

Change-Id: Ibee7ad78253a2fe02957b6b05d26d740d38a0433
 2021-08-10 22:34:47 +00:00
TreeHugger Robot
0606505179 Merge changes I7a3ba2af,Ifa89ae43 into sc-dev am: 0f1dd468bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15504100

Change-Id: Ie6cc54562360d2c028ec416a57322c7f923f8b5a
 2021-08-10 22:33:57 +00:00
TreeHugger Robot
d9b7772c52 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ddd769d0d6 -s ours am: 48411fcd34 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38fd98780aed2475f3a760858bee932cd4d11f24
 2021-08-10 22:33:48 +00:00
TreeHugger Robot
6ce048e329 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ddd769d0d6 -s ours am: 48411fcd34 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia70e6bd1ca3250fd6d50ee9bd53accc36593ca49
 2021-08-10 22:32:52 +00:00
Michael Groover
71f64ff1ac Merge "Create new instance of shared lineage signers to preserve capabilities" into sc-dev 2021-08-10 22:30:03 +00:00
Automerger Merge Worker
7162d024b2 Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev 2021-08-10 22:29:35 +00:00
Dave Mankoff
926e47bcdc [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: If05869aa7d10c4696e98b6e677491792f272ea73
 2021-08-10 22:29:02 +00:00
Emilian Peev
5cf033ccb7 Camera: Return sequence id for advanced extension requests 
Allow 'IRequestProcessorImpl' to return the camera sequence id
in response to capture requests.

Bug: 196090349
Test: atest -c
cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java

Change-Id: I3d67e4ba1b4503cf71c31751920e916d014ef3ab
 2021-08-10 15:26:24 -07:00
Joe Bolinger
6c582e973d Remove new task flag when launching unicorn enrollment. 
Bug: 196103931
Test: manual (enroll via settings)
Change-Id: I35aae96e4ebb0c13bc567bb926f2e7a549f554ba
 2021-08-10 15:05:42 -07:00
Mady Mellor
55479777dd DO NOT MERGE [QPR1] Fix QS having a white when opened over bubbles 
mBehindTint now controls the background of quick settings.
I think this wasn't the case in R when the  bubble state
was written & it was never updated appropriately whenever
that changed.

Seems like most of the code in the unlocked state should
apply to bubbles so just copied it in and updated the
test.

Test: atest ScrimControllerTest
Bug: 191338071
Change-Id: I90fa26760d346a67d42b22d8e562d5b4c66f3017
 2021-08-10 22:01:31 +00:00
Mady Mellor
8f71a21677 [QPR1] Fix dismiss not working in landscape 
In stack animation controller only one target would ever
be added so when the target is re-created after rotating
then it wouldn't be used.

Test: - have some bubbles, drag them around, rotate device, try to
        dismiss them => they can be dismissed in landscape
      - get more bubbles, rotate back to portrait, try to dismiss
        them => they can be dismissed in portrait
      - drag the stack around the edges of the screen and verify that
        the only magnetic spot is where the dismiss target is
Fixes: 193008696
Change-Id: I6b24b1f9d301d37749dc67c95392fd6c8451df00
Merged-In: I6b24b1f9d301d37749dc67c95392fd6c8451df00
 2021-08-10 21:53:59 +00:00
TreeHugger Robot
0f1dd468bd Merge changes I7a3ba2af,Ifa89ae43 into sc-dev 
* changes:
  Fix app widget deadlock when toggling overlays
  Revert "Revert "Apply overlay updates to widget provider info""
 2021-08-10 21:46:39 +00:00
Robert Carr
d7e56f5b96 Update wallpaper offset when changing target from null 
updateWallpaperOffsetLocked copies the IPC received values to the state
variables that are actually set on the wallpaper window. It skips
this job when there is no wallpaper target. In a situation where we are
going from no wallpaper target to wallpaper target (e.g. lock screen
wallpaper) there may be nothing to trigger this method to be called
again when we finally receive a wallpaper target, and we then have
to wait for another IPC. Since there were some values ignored, it
can lead to some jank/misalignment.

Bug: 195596603
Test: Repro from bug.
Change-Id: I3ef19b77bc33546a3e80bca75532d017b4712054
 2021-08-10 21:29:35 +00:00
TreeHugger Robot
48411fcd34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ddd769d0d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb6ba573de3d611c8f506b355b2f8a15c6834579
 2021-08-10 21:29:34 +00:00
Dave Mankoff
80a875282b [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: If6c9892c0816129270ee0c9ebaeb22c4bf7bc5a5
 2021-08-10 21:29:16 +00:00
Soonil Nagarkar
271b907bab Fix Location equals() 
Should handle extras in a better manner.

Bug: 196075248
Test: presubmits + manual
Change-Id: I89e45c289b26ea97486c5a72feb0a805c8c1a950
 2021-08-10 14:25:39 -07:00
TreeHugger Robot
ddd769d0d6 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-10 21:10:45 +00:00
Dave Mankoff
7a3c87fb49 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: da9baed374 -s ours am: 642240ef30 -s ours am: 52f4e7e822 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: I0539da34faf13425884b789ee201583f2dab06c7
 2021-08-10 21:10:42 +00:00
Automerger Merge Worker
445ed1a0a5 Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: 4b8f7a7991 -s ours am: 49ee68690f -s ours am: c2021a3074 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-10 21:10:33 +00:00
Dave Mankoff
c749a38cc3 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: da9baed374 -s ours am: 642240ef30 -s ours am: 414288574a -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: I34defd31ce167f061db945fbf1e40192d60ce146
 2021-08-10 21:10:20 +00:00
Dave Mankoff
390ab7189e [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: 4b8f7a7991 -s ours am: 49ee68690f -s ours am: f6b9251fbc -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: I5385b3197f826c66f95cd59b3e046ab873e123e2
 2021-08-10 21:10:11 +00:00
TreeHugger Robot
eda2c3d778 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 262de4fb4f -s ours am: 785ec227e5 -s ours am: df88fd09f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieabaa2ecc4151f9ca1d3f9e912d908dcbbf2ad76
 2021-08-10 21:09:59 +00:00
TreeHugger Robot
606d70022b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5f7ad43cdf -s ours am: fcd7401cfd -s ours am: 10419d46a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebc69292398bc886b9dead7ea84a0a26c235ef08
 2021-08-10 21:09:51 +00:00
Automerger Merge Worker
b34dca0614 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 40cb9ed9c1 -s ours am: 2e95d0be8c -s ours am: c74a68a5e5 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-10 21:09:49 +00:00
Dave Mankoff
b780c00079 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: 4b8f7a7991 -s ours am: 49ee68690f -s ours am: c2021a3074 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: Ic7057cc565dbc1d66d547a4761ac2fc1c63e2673
 2021-08-10 21:09:47 +00:00
TreeHugger Robot
9c5e1fe422 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 40cb9ed9c1 -s ours am: 2e95d0be8c -s ours am: c74a68a5e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc7132eaca7788b3a1b498762a5856203c293a0f
 2021-08-10 21:09:42 +00:00
Automerger Merge Worker
1ac36cc86b Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 262de4fb4f -s ours am: 785ec227e5 -s ours am: 87b06aefa2 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-10 21:09:40 +00:00
Dave Mankoff
6be66c4977 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: dab8365333 -s ours am: 826e38be42 -s ours am: a920a2ea1c -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: If5ca86bd441aff254b77009b0d33bada3cb379e8
 2021-08-10 21:09:34 +00:00
TreeHugger Robot
3ad1da4289 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 262de4fb4f -s ours am: 785ec227e5 -s ours am: 87b06aefa2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9840ab395c232e5ad260856f5f2abf0456cd5ec6
 2021-08-10 21:09:28 +00:00
Dave Mankoff
69878fb4da [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: be89b2aa43 -s ours am: 4bd029298a -s ours am: 86ed339ccc -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: Ic600f9784b98f14bb41b91a0d618fb8f0ae95a4b
 2021-08-10 21:09:19 +00:00
TreeHugger Robot
20314a22c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5f7ad43cdf -s ours am: fcd7401cfd -s ours am: 1adecd0740 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic05ccc50e5ec739eedebb18cf1ec50031945aee0
 2021-08-10 21:09:13 +00:00
TreeHugger Robot
959283fafd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 40cb9ed9c1 -s ours am: 2e95d0be8c -s ours am: 817a17b203 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0fddd2c61db059c7432327180588a8cb61c2a714
 2021-08-10 21:08:55 +00:00
Dave Mankoff
70a5657935 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: Iaa43cc4773165cd15b16f9f072977bc0b7feb01a
 2021-08-10 21:08:46 +00:00
Dave Mankoff
8b6343a4ea [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: dab8365333 -s ours am: 826e38be42 -s ours am: 6025909575 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: Iec9407e3e8e15896478f699c83c20e072cd60a9e
 2021-08-10 21:08:46 +00:00
Dave Mankoff
85af38132c [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: be89b2aa43 -s ours am: 4bd029298a -s ours am: edb8eab9eb -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: Ia62752036997162d77d872fae8b2db1c8edd4318
 2021-08-10 21:08:32 +00:00
Rahul Sabnis
465f489430 Require calls to BluetoothA2dp#setBufferLengthMillis to pass a 
non-negative value

Tag: #feature
Bug: 194837771
Test: Manual
Merged-In: I3c1d2da1d28a494d8b393c4502521b3f0699adf6
Change-Id: I3c1d2da1d28a494d8b393c4502521b3f0699adf6
 2021-08-10 13:57:57 -07:00
Dave Mankoff
58dcd2c312 Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev 2021-08-10 20:35:05 +00:00
Dave Mankoff
52f4e7e822 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: da9baed374 -s ours am: 642240ef30 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: I5ec200099907035558540f335196d959779fbfd6
 2021-08-10 20:19:54 +00:00
Dave Mankoff
414288574a [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: da9baed374 -s ours am: 642240ef30 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: If16530b64c7151e71a6cd872afef4ce2c0e9f45b
 2021-08-10 20:19:38 +00:00
Dave Mankoff
f6b9251fbc [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: 4b8f7a7991 -s ours am: 49ee68690f -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: I68652c32d2023f057a9eb5c49329da8f8247c090
 2021-08-10 20:19:32 +00:00
Dave Mankoff
c2021a3074 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: 4b8f7a7991 -s ours am: 49ee68690f -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: If0ab29dc9fd37e6c7dafe106970b6cf421676fca
 2021-08-10 20:19:32 +00:00
TreeHugger Robot
df88fd09f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 262de4fb4f -s ours am: 785ec227e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5efd138c345f54ae26a4b53eb11ae7985c320191
 2021-08-10 20:19:28 +00:00
TreeHugger Robot
10419d46a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5f7ad43cdf -s ours am: fcd7401cfd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I559c1eb816d49785a1b17e3cc38bb7dfca4d586d
 2021-08-10 20:19:23 +00:00
TreeHugger Robot
87b06aefa2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 262de4fb4f -s ours am: 785ec227e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I076d4584064147ae1d0162343be53b1cc383c182
 2021-08-10 20:19:19 +00:00
TreeHugger Robot
c74a68a5e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 40cb9ed9c1 -s ours am: 2e95d0be8c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90f49e3d8050c4280ca0a627a27e0017c80bfb02
 2021-08-10 20:19:17 +00:00