TreeHugger Robot
|
fdd3d8cdac
|
Merge "Make READ_NEARBY_STREAMING_POLICY adoptable by shell for CTS tests" into tm-dev am: c0fc0ae2c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17729989
Change-Id: I038a81e7ba479145c1e94a9c33eda60ada7de039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:21:12 +00:00 |
|
John Wu
|
337dacaf0d
|
Merge "Null check before accessing mRemovedInfo in PMS" into tm-dev am: a46e2b911c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17727408
Change-Id: I659fbd4e01d7b2c42c041a6703e15cac4b501e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:20:48 +00:00 |
|
TreeHugger Robot
|
a337e3415d
|
Merge "Add metrics for low battery warning" into tm-dev am: 5dc3845396
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17635305
Change-Id: I48cf7b00ce9e91ef42079ddcf30bd87b61a382fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:19:00 +00:00 |
|
Nate Myren
|
acf33b0d8d
|
Merge "Make AutoTileManager lisen for component enable/disable" into tm-dev am: b3ed7e93e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17239956
Change-Id: Ie5866a5c7ea23d87251e1bf4144f9f1b8ad1023f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:18:10 +00:00 |
|
Bill Yi
|
2cb299b4be
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 31773816e7 -s ours am: 5d1328ca15 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17740624
Change-Id: I1cb6f45524632894cd48e7c7bf78138193135ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:17:49 +00:00 |
|
Bill Yi
|
50de688964
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3fd7e02e7f -s ours am: c6e89c7b3e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17740624
Change-Id: Ia5ea2610fc0efadd4de17628546ad0c4473e10fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:17:47 +00:00 |
|
Bill Yi
|
ba014a8ac0
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 558a3781e9 -s ours am: 55d46bf7f6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730693
Change-Id: I39974dce165033e99e8e75c877808d9b8b84fb6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:17:39 +00:00 |
|
Bill Yi
|
10ab19dcec
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23530b9084 -s ours am: 5fa83b4cff -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730693
Change-Id: Iec015d18755e139c623b6d1e895624bfb8c7f49b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:17:38 +00:00 |
|
Bill Yi
|
649825ebe3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9dd6e17902 -s ours am: aae0f60638 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17738475
Change-Id: I088a02b68340b777c34de491db50396d13064fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:17:30 +00:00 |
|
Automerger Merge Worker
|
b16305c6c2
|
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 11205c0fa2 -s ours" into tm-dev am: 457668d2db -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17740629
Change-Id: I2297b481072b01b7bacd816ced64b8be951ef549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:17:20 +00:00 |
|
Bill Yi
|
a156720b59
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 11205c0fa2 -s ours am: 40e6dd2637 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17740629
Change-Id: Ibfc66270f3305b8399e580b707736695eefcd0f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:17:19 +00:00 |
|
Bill Yi
|
086bbb5280
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4b06a7e690 -s ours am: 54bd0b5d35 -s ours am: 276adeddbf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17741045
Change-Id: Ib2b2c984421a22928bc3acee33abb8982ebfc559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:16:49 +00:00 |
|
Bill Yi
|
6befc25fb7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8055f832ca -s ours am: e4c8eff63c -s ours am: 027cdaa5dc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17741045
Change-Id: I5a1fee666aa90d68652df00a08197fd3dc48dbe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:16:48 +00:00 |
|
Bill Yi
|
7c81a35f1b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3b681d7c20 -s ours am: 85af26ac68 -s ours am: fb99f0b6f2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734713
Change-Id: Ic2e7a8cad5771eaf2d88f3b294da50103d006a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:16:43 +00:00 |
|
Automerger Merge Worker
|
c26e4a135b
|
Merge changes from topic "am-6edfa0d45b204ee2885798a044e33cd8" into tm-dev am: 6397b1e3b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17726756
Change-Id: Idb878300ea9af82d2d5fd4f5e82aa20dd973f040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:16:33 +00:00 |
|
Bill Yi
|
b987cb6842
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d0e22717e3 -s ours am: 6b2627ff3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17726756
Change-Id: I615bee2ecd2a55ca9bb8476c2c379e1b2521351a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:16:24 +00:00 |
|
Bill Yi
|
f30dc0d95f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbafdfce8d -s ours am: 539a1a6c1c -s ours am: 268f59340a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734706
Change-Id: Iba0ad611844be65fc54ca2e43da4f97784c80407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:15:09 +00:00 |
|
Bill Yi
|
f6750f66af
|
Merge changes from topic "presubmit-am-6d026c0057d6491db92643d150b2f314" into sc-v2-dev-plus-aosp am: 9d9c759be0 am: 6427fd0943
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734713
Change-Id: I587dc12475a2febfee0f6e07e2ef5bff5ca2982a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:15:02 +00:00 |
|
Bill Yi
|
883ac64d80
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 758f1d490e am: 4a293844a7 -s ours am: cba570877f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734713
Change-Id: Icbcc92c1be115a963ff5a9bafbcb065ed11b4fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:15:01 +00:00 |
|
TreeHugger Robot
|
c0fc0ae2c7
|
Merge "Make READ_NEARBY_STREAMING_POLICY adoptable by shell for CTS tests" into tm-dev
|
2022-04-14 16:02:04 +00:00 |
|
John Wu
|
a46e2b911c
|
Merge "Null check before accessing mRemovedInfo in PMS" into tm-dev
|
2022-04-14 15:59:19 +00:00 |
|
TreeHugger Robot
|
5dc3845396
|
Merge "Add metrics for low battery warning" into tm-dev
|
2022-04-14 15:48:55 +00:00 |
|
Nate Myren
|
b3ed7e93e1
|
Merge "Make AutoTileManager lisen for component enable/disable" into tm-dev
|
2022-04-14 15:44:50 +00:00 |
|
Bill Yi
|
5d1328ca15
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 31773816e7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17740624
Change-Id: I632457e35c84d8e2bb18ae06674d5d720795059c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:36:37 +00:00 |
|
Bill Yi
|
c6e89c7b3e
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3fd7e02e7f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17740624
Change-Id: I406207748c0bb483dd9639ff070c3e6aa9e31342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:36:26 +00:00 |
|
Bill Yi
|
55d46bf7f6
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 558a3781e9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730693
Change-Id: I144ec8895faacc196ac9df4887080776d207ac58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:35:51 +00:00 |
|
Bill Yi
|
5fa83b4cff
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23530b9084 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730693
Change-Id: I477334f6c7aa7ca318796f76b56ea9c000a060fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:35:39 +00:00 |
|
Bill Yi
|
aae0f60638
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9dd6e17902 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17738475
Change-Id: I344e104275f12fee97b70e18f3accc4db963c95a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:35:06 +00:00 |
|
Automerger Merge Worker
|
457668d2db
|
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 11205c0fa2 -s ours" into tm-dev
|
2022-04-14 15:34:39 +00:00 |
|
Bill Yi
|
276adeddbf
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4b06a7e690 -s ours am: 54bd0b5d35 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17741045
Change-Id: I8f0579301c003778b923394cb2420610dca1c524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:34:26 +00:00 |
|
Bill Yi
|
40e6dd2637
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 11205c0fa2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17740629
Change-Id: Ie0b216faaa1b9eec66cc14f42c1aca44aa7d0bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:34:23 +00:00 |
|
Bill Yi
|
027cdaa5dc
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8055f832ca -s ours am: e4c8eff63c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17741045
Change-Id: I415a9a8b9c5242d65887436d38e5fa8c12d9770b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:34:11 +00:00 |
|
Bill Yi
|
fb99f0b6f2
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3b681d7c20 -s ours am: 85af26ac68 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734713
Change-Id: I5e4c89a47fe6523965c7ee65e8a1416dec3dfc13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:33:49 +00:00 |
|
Automerger Merge Worker
|
6397b1e3b5
|
Merge changes from topic "am-6edfa0d45b204ee2885798a044e33cd8" into tm-dev
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d0e22717e3 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff24f43363 -s ours
|
2022-04-14 15:33:46 +00:00 |
|
Bill Yi
|
268f59340a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbafdfce8d -s ours am: 539a1a6c1c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734706
Change-Id: I6acd6e82eb4b1924cd0544f4680df4507ee06ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:33:32 +00:00 |
|
Bill Yi
|
6b2627ff3f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d0e22717e3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17726756
Change-Id: Ifcf397a10b17c052c40e837eaf143745131193cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:33:25 +00:00 |
|
Bill Yi
|
990354e143
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff24f43363 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17726756
Change-Id: Iedce5ce61b557759719cc131fb1e0e7feec9d6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:33:14 +00:00 |
|
Bill Yi
|
54bd0b5d35
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4b06a7e690 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17741045
Change-Id: Ib12ae17720948783000b6d16f103e6b72d58ae0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:32:51 +00:00 |
|
Bill Yi
|
e4c8eff63c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8055f832ca -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17741045
Change-Id: I0c12945518fe6cac980b25273e47d303f8d2d5ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:32:44 +00:00 |
|
Bill Yi
|
6427fd0943
|
Merge changes from topic "presubmit-am-6d026c0057d6491db92643d150b2f314" into sc-v2-dev-plus-aosp am: 9d9c759be0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734713
Change-Id: I77bbcb0ee93802449f4645a451df02c8ab3d1fce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:32:42 +00:00 |
|
Bill Yi
|
cba570877f
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 758f1d490e am: 4a293844a7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734713
Change-Id: Ia5ae6e6b4afa08529374395b000d060548294d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:32:26 +00:00 |
|
Bill Yi
|
85af26ac68
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3b681d7c20 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734713
Change-Id: I7e1021385ef261f7fa1db7e90fe75fe08e0ea863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:32:04 +00:00 |
|
Bill Yi
|
539a1a6c1c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbafdfce8d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734706
Change-Id: I79c75383442c68aaaa55e743cfbe5dbaaa4ae9d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:31:43 +00:00 |
|
Bill Yi
|
9d309b7fd6
|
Merge changes from topic "presubmit-am-11ef4e3648214d1aabef3b795a4830d6" into tm-dev am: 294898b5ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17738475
Change-Id: I4808cb490986e5c478ccbff687c59ee38d14d0cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:19:48 +00:00 |
|
Bill Yi
|
a0001c7840
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 95b6f5ff0f am: 4de6e7e86d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17738475
Change-Id: If07886cc105e7b312caba99306a2fc2bc0912a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:19:47 +00:00 |
|
Bill Yi
|
7490f89514
|
Merge changes from topic "presubmit-am-fc5cbd46af764774b734634f6be03d6b" into tm-dev am: 2be0594a93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17740629
Change-Id: I330e2c2243721c63e00cd75bf696293c438abac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:19:22 +00:00 |
|
Bill Yi
|
987187091a
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a488dd99ac am: 0bd9e4ee9b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17740629
Change-Id: Id5696b556e12d1fe0a6e8a43c1908982c2fedb8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:19:20 +00:00 |
|
Bill Yi
|
d06c796000
|
Merge changes from topic "presubmit-am-65f63803c7ea434591f05342f4d5cc98" into tm-dev am: 40f6441d27
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734712
Change-Id: I15ae37ab1b149238ee88a66fb81fb1d37044a14d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:18:26 +00:00 |
|
Bill Yi
|
f1dafb3a29
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 87a366b763 am: fe439abbf6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734712
Change-Id: I7f3c9e4c1e0ddc6e7b4765fa0a5f48d63ca92eb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:18:25 +00:00 |
|
Beth Thibodeau
|
3e3ed56a7a
|
Merge "Don't bring up keyguard when activity can show over lockscreen" into tm-dev am: f5a79fb799
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17729628
Change-Id: I9400cfd6ff4be99074828f06ed12f79abfd57be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:17:46 +00:00 |
|