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
e8758b7c4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8f1cf56b89 -s ours am: a40e2a39bb -s ours am: 7ab30499ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23fd6a983ffa9f1db63659ab9cfab0410e3a368c
 2021-08-13 22:04:46 +00:00
TreeHugger Robot
5fa0d1ea1a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 96a6987826 -s ours am: 6d78431b3d -s ours am: 4b9d578857 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0cf62dbab1c7e86a2bf6ac63a1a573f0f38ab24
 2021-08-13 22:04:40 +00:00
TreeHugger Robot
fb23791113 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: dd5832d8e5 -s ours am: 28d546f8a4 -s ours am: c34fc0201a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11a2581bf84bef0b805a377c3fe451b673538fa8
 2021-08-13 22:04:35 +00:00
TreeHugger Robot
8737b67e6e Merge "Fix OOB crash in ContentCapture for translated views" into sc-dev am: f7fb6c535e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546784

Change-Id: Iaa763bccd737636ec9eb3ed95877a19226d5d43a
 2021-08-13 22:04:32 +00:00
TreeHugger Robot
9585fbfafc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 50fcaffe22 -s ours am: 65d427c1b6 -s ours am: eafa32552d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc347c344e4766cbb33209774e998ebfc2a0aec4
 2021-08-13 22:04:29 +00:00
TreeHugger Robot
96bc587912 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 04c8164ada -s ours am: fa0563d581 -s ours am: b82b3d2d4f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d71b8d31a7fb922b4721242ed4eeb85b3b8958b
 2021-08-13 22:04:23 +00:00
TreeHugger Robot
e7bc149f37 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 277d17849c -s ours am: 6f21cc649e -s ours am: 4dfa135a05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e19df45a29bf4854126bb9b113058997dbf4a15
 2021-08-13 22:04:17 +00:00
Sudheer Shanka
0a1b0ea62e [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 0ce17cddf9 -s ours am: 8502712492 -s ours am: ac4c95a68b -s ours 
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: I0f6e704de2665d841dd995c46ca29adc02f9f7c9
 2021-08-13 22:04:09 +00:00
Lucas Lin
df1a8798fc [automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: c940a77495 -s ours am: 0d88bdece9 -s ours am: 064bc99e49 -s ours 
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history

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

Change-Id: I0e674e6fbf428dba1dd81eee16f0b0ed8d6398cf
 2021-08-13 22:03:59 +00:00
Lucas Lin
a50ae1b8f2 [automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: d28527a3fe -s ours am: ba72ebb1ea -s ours am: d3a57f42f4 -s ours 
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history

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

Change-Id: I3e99f887f03dd994e3f149f4d3de2515e833aabb
 2021-08-13 22:03:50 +00:00
TreeHugger Robot
a2c9825edb Merge "Fix OOB crash in ContentCapture for translated views" into sc-dev am: f7fb6c535e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546784

Change-Id: I62b847a14cab516de1f87e32e597c1706145979a
 2021-08-13 22:03:10 +00:00
TreeHugger Robot
f7fb6c535e Merge "Fix OOB crash in ContentCapture for translated views" into sc-dev 2021-08-13 21:59:25 +00:00
Ray Essick
243e5ab2b2 Rename android.media.MediaTranscodeManager -> MediaTranscodingManager 
renamed to avoid conflict with existing copy in the R framework.jar.
The framework.jar copy was removed during S development

Bug: 195608856
Test: build
Test: cts-tradefed run cts -m CtsMediaTranscodingTestCases
Merged-In: I40ab066cd61be8d278f21cc788016f2edd6bb86e
Change-Id: I40ab066cd61be8d278f21cc788016f2edd6bb86e
 2021-08-13 21:57:24 +00:00
Bill Yi
85f6751996 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 385c28b337 -s ours am: fbd4d23c91 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd1ff47feb7b50303a5449b3bfeb6ba7a921b0e4
 2021-08-13 21:53:22 +00:00
Sudheer Shanka
7fccc88802 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 5833c655f9 -s ours am: cce33c3589 -s ours 
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: I95e619b0b5f0a86620b31fd8a2ad8668c03e4756
 2021-08-13 21:53:16 +00:00
Bill Yi
f9884c0a12 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 385c28b337 -s ours am: fbd4d23c91 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c2cf288effe3400689fcf3627701df6b0ef322f
 2021-08-13 21:53:08 +00:00
Bill Yi
32e3af5d72 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 015f5f4ac2 -s ours am: 6290323933 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I936e976102fe4dc62782e97d35767fa871d52c18
 2021-08-13 21:53:05 +00:00
Sudheer Shanka
1444f9907f [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 5833c655f9 -s ours am: cce33c3589 -s ours 
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: Idab84936199f2de7fe225ae307db36e667bed96b
 2021-08-13 21:53:04 +00:00
Bill Yi
eb27fe4aaf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 015f5f4ac2 -s ours am: 6290323933 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia61a62aa1881e0f2c94e711d8b0fd81810baf5db
 2021-08-13 21:52:49 +00:00
TreeHugger Robot
aa34708140 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8f1cf56b89 -s ours am: a40e2a39bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I70d0f9b3ce22fbf3b6d41221386283f619a9df4e
 2021-08-13 21:52:46 +00:00
TreeHugger Robot
b924966952 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 96a6987826 -s ours am: 6d78431b3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71bff1894b81040f69532bfa434ad4f9c57396ce
 2021-08-13 21:52:42 +00:00
TreeHugger Robot
7ab30499ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8f1cf56b89 -s ours am: a40e2a39bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82d4ef7583b51b175078dfc5894775860e2bc27c
 2021-08-13 21:52:12 +00:00
TreeHugger Robot
d09c18fc31 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: dd5832d8e5 -s ours am: 28d546f8a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9441a270e81d716bb4b2adc0bfd0d6d68d702f1
 2021-08-13 21:52:08 +00:00
TreeHugger Robot
4b9d578857 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 96a6987826 -s ours am: 6d78431b3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5ad248384415011df43cec851ca27f8c5f41dbb
 2021-08-13 21:52:01 +00:00
TreeHugger Robot
55575cd77a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 50fcaffe22 -s ours am: 65d427c1b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4adb5c62bc839dcb5b1f1a0865617028ebcb2984
 2021-08-13 21:51:55 +00:00
TreeHugger Robot
c34fc0201a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: dd5832d8e5 -s ours am: 28d546f8a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e60e3e114a2a2bd2106ffd08a04eee368c876e8
 2021-08-13 21:51:49 +00:00
TreeHugger Robot
ce3c869688 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 04c8164ada -s ours am: fa0563d581 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7e8a6e8bc345c257e130f88a76c8e147f148e36
 2021-08-13 21:51:42 +00:00
TreeHugger Robot
eafa32552d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 50fcaffe22 -s ours am: 65d427c1b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib2b5b2f0d56f584564ed9837f0b67702a3c05dcd
 2021-08-13 21:51:33 +00:00
TreeHugger Robot
fbbf281b43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 277d17849c -s ours am: 6f21cc649e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id96870a312f54ab47c23aac1eddedf0c7e6e02b1
 2021-08-13 21:51:32 +00:00
Sudheer Shanka
ea465067e1 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 0ce17cddf9 -s ours am: 8502712492 -s ours 
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: Idf0a200aa1f9140bd487d44b9da3680b123d360f
 2021-08-13 21:51:28 +00:00
TreeHugger Robot
b82b3d2d4f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 04c8164ada -s ours am: fa0563d581 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib20b12506556ead9dac3decfac532d986f46a476
 2021-08-13 21:51:22 +00:00
Lucas Lin
778117f023 [automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: c940a77495 -s ours am: 0d88bdece9 -s ours 
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history

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

Change-Id: I5e95d17a7f823a4afe60f1cc8d817f5dd858f03a
 2021-08-13 21:51:16 +00:00
TreeHugger Robot
4dfa135a05 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 277d17849c -s ours am: 6f21cc649e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18e23878e92438eff19fdf02c310d739aa7f4234
 2021-08-13 21:51:06 +00:00
Sudheer Shanka
ac4c95a68b [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 0ce17cddf9 -s ours am: 8502712492 -s ours 
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: Ie35be995bd81056f44b17f0112256ae76b944206
 2021-08-13 21:50:53 +00:00
Lucas Lin
78a8f3423e [automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: d28527a3fe -s ours am: ba72ebb1ea -s ours 
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history

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

Change-Id: Ide65fdc9b64614019c8d0f48fa3c126cc7334d44
 2021-08-13 21:50:46 +00:00
Lucas Lin
064bc99e49 [automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: c940a77495 -s ours am: 0d88bdece9 -s ours 
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history

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

Change-Id: If4f486ff71d52d4cc5c33e4dfc9434a5c5d6d3c0
 2021-08-13 21:50:37 +00:00
Lucas Lin
d3a57f42f4 [automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: d28527a3fe -s ours am: ba72ebb1ea -s ours 
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history

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

Change-Id: Ib557d9a3ae150dcba3cce9aa88f4cb891fc798be
 2021-08-13 21:50:23 +00:00
Bill Yi
fbd4d23c91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 385c28b337 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6683f40d46cfc0612348e653f057c8f20f97716
 2021-08-13 21:47:35 +00:00
Sudheer Shanka
cce33c3589 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 5833c655f9 -s ours 
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: I0c16d851fc0703c277bb691db84d58f295590a66
 2021-08-13 21:46:34 +00:00
TreeHugger Robot
011ff2d36d Merge "Auth ripple updates" into sc-dev am: 6ce7011395 am: 278c62c8b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546250

Change-Id: I8476c365cb995dd3ae109ed6919445bea29677cf
 2021-08-13 21:35:06 +00:00
Xi Han
18081fdd21 Merge "Do not display "Network Available" when WiFi disabled." into sc-qpr1-dev am: b8655177fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547695

Change-Id: If0fdc094277e8e7a2d234757cb86eb160dccb8d6
 2021-08-13 21:34:22 +00:00
TreeHugger Robot
63fdef3773 Merge "Auth ripple updates" into sc-dev am: 6ce7011395 am: 47e2fa60c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546250

Change-Id: Ib4383e33c54f404a4525161b814d77fa6b216b55
 2021-08-13 21:32:58 +00:00
Bill Yi
6290323933 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 015f5f4ac2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9232f7a783c25bcf8a31fa5c57f6fea1953249e6
 2021-08-13 21:32:43 +00:00
TreeHugger Robot
a40e2a39bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8f1cf56b89 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72b983f945aacb7c7f9977b9c38daa2c54af0680
 2021-08-13 21:32:19 +00:00
Automerger Merge Worker
40553ca0c7 Merge "[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 30a1c99c1b -s ours am: ab3349d696 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-13 21:32:15 +00:00
TreeHugger Robot
6d78431b3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 96a6987826 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14d21a7a622be2b789f97e58193177dbae567829
 2021-08-13 21:32:05 +00:00
Xin Li
7aeb60ca87 [automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 30a1c99c1b -s ours am: ab3349d696 -s ours 
am skip reason: Merged-In I35aae96e4ebb0c13bc567bb926f2e7a549f554ba with SHA-1 6c582e973d is already in history

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

Change-Id: I2853c1f42f5ca0e7a92fd2328e2f2c9eb23a8362
 2021-08-13 21:31:38 +00:00
TreeHugger Robot
28d546f8a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: dd5832d8e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf556e20853336c893524d0e94989e1d231fd6eb
 2021-08-13 21:31:27 +00:00
TreeHugger Robot
65d427c1b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 50fcaffe22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1e8e48d53066173e9df352085d6316544034a9d
 2021-08-13 21:31:11 +00:00
TreeHugger Robot
fa0563d581 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 04c8164ada -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic85991ba5d94e87096e7e892eccaa559bc8bccf0
 2021-08-13 21:30:55 +00:00