Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
773,569 Commits 3 Branches 0 Tags
df9354d4545f00bd2e1415bddcbd809dad9569dc
Commit Graph

773569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shan Huang
df9354d454 Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa58 am: 9dd284ba1e am: 4ffa0e7214 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18407083

Change-Id: If17cecf90e1eb82eb46da6cadff543962bd6e8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:05:31 +00:00
Sudheer Shanka
9fab7ac7ed Merge "Update OWNERS for broadcast response related classes." into tm-dev am: 9af0eed1de am: d0fa6d117b am: 0fe7ac75f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18377776

Change-Id: I973a6582cf827dd651740cbd9cad137658426069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:03:04 +00:00
Sudheer Shanka
34d7471a37 Merge "Group broadcasts occurred within a certain duration into sessions." into tm-dev am: 0a790c6419 am: 8aa21b257c am: d10894cf0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18360308

Change-Id: Iae81429779464f4fb9c6ff5a610659420f6a6b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:02:39 +00:00
Sudheer Shanka
1d45dd0418 Merge "Don't consider PACKAGE_USAGE_STATS permission." into tm-dev am: 4bc2075b9f am: afba0fb8b1 am: 6549a44ea3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188884

Change-Id: Id45eb8d4cf198fd31218bf437132f028d030abb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:01:57 +00:00
Yasin Kilicdere
1ced9f21b0 Merge "Puts mPm.onNewUserCreated inside Binder.withCleanCallingIdentity" into tm-dev am: 3a6a67c5b4 am: 34a6051115 am: df8ce604a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356864

Change-Id: I28661244d9982a4f0fe02f0d37284170b467520c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:01:44 +00:00
TreeHugger Robot
2c05963a48 Merge "Remove duplicate allowlist entries for Bluetooth" into tm-dev am: 5ea9ade689 am: 0dd6fa2510 am: 4c53be5731 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18080601

Change-Id: I5d0428ef738fe9c6a4cc23b09a2de68f1fe3c021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:01:27 +00:00
TreeHugger Robot
a8d896efe1 Merge "Remove vendor apex privapp allowlist pruning" into tm-dev am: 05e61e90c5 am: 966a3b9bb0 am: 8512b60834 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988646

Change-Id: I16f9f32d81a7fda54bb8813b4d72aa4e1d8d45d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:01:24 +00:00
Jiakai Zhang
f7e51d1ff6 Merge "Only check System UI dexopt status after a mainline update or an OTA." into tm-dev am: 7ed6106f10 am: 5f4054c02d am: b71635bb0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907961

Change-Id: I74065417f8f1e7b4c50e7a1b84e5e627ee271b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:00:53 +00:00
Justin Weir
336f9a713e Merge "Move Volume control Binder calls to worker thread" into tm-dev am: 6f8b2f6da2 am: ac77cec733 am: b47ad4a1e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350527

Change-Id: I6d97681daba5e996faa9d41cf9cc4173a852bfa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:00:39 +00:00
Winson Chiu
71afaf8feb Merge "Generalize canPackageQuery error message" into tm-dev am: 96ad5ccad9 am: 808aa0df7b am: 6006b2b531 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18358288

Change-Id: Ifc9a3b997fbcaca13401f50b786b31e3d3fdf873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:00:26 +00:00
Songchun Fan
bd59bed3ce Merge "[AppsFilter] fix cache lock and rebuild cache if needed" into tm-dev am: cd1a10a216 am: 8ea7db28d2 am: 2db88652e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18360458

Change-Id: Ifed35a858bcc79af888f57364f649d82ccfe4825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:00:14 +00:00
Shan Huang
eca23d560f Merge "Fix broken animation on two consecutive swipes." into tm-dev am: 8a91edd4a3 am: ff20854f60 am: a1936419b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17963879

Change-Id: Iac74fdb78d569519a4a411f17ad65e99a1db34b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:59:54 +00:00
TreeHugger Robot
f63ead00f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e0e88a3637 -s ours am: 9e673cb148 -s ours am: e8337afde5 -s ours am: 8700515ec0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6cd949a1c57e8e3175216eaf07a9a200c1f83c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:58:52 +00:00
Bill Yi
e5bf48c7a3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42337b7a03 -s ours am: 01b60c3ed2 -s ours am: 565656b6e2 -s ours am: 39edc4d33e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0cba1de827f0e7a485fa8498b51eefc8df4ee39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:58:38 +00:00
TreeHugger Robot
28f6f6076f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 59b4e7c766 -s ours am: 43cd498d2b -s ours am: 926c291deb -s ours am: 491c881d0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If568b4e550924182a114b571bc1299b314ba5308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:58:22 +00:00
Bill Yi
697e013c7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ce170abf7 -s ours am: 9baa5f2ac0 -s ours am: 07e56b1188 -s ours am: 381cdd60b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3ce3c715150c2cb5ce5f2c7827645c70c21ab26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:58:04 +00:00
Shan Huang
4ffa0e7214 Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa58 am: 9dd284ba1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18407083

Change-Id: Ibe9d767ae049a06d8386175cab46c7127d70c61c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:49:42 +00:00
Sudheer Shanka
0fe7ac75f9 Merge "Update OWNERS for broadcast response related classes." into tm-dev am: 9af0eed1de am: d0fa6d117b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18377776

Change-Id: Ibc35e7a6d6a80ba20a1db35a1a51e1b8c2bc65be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:49:15 +00:00
Sudheer Shanka
d10894cf0a Merge "Group broadcasts occurred within a certain duration into sessions." into tm-dev am: 0a790c6419 am: 8aa21b257c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18360308

Change-Id: I5f8652f09f8a14d9d2dd2277a452c7330bd621e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:49:01 +00:00
Sudheer Shanka
6549a44ea3 Merge "Don't consider PACKAGE_USAGE_STATS permission." into tm-dev am: 4bc2075b9f am: afba0fb8b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188884

Change-Id: I4f98bc4d21bc4aca7fead7fcab908abb0613ab4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:48:39 +00:00
Yasin Kilicdere
df8ce604a5 Merge "Puts mPm.onNewUserCreated inside Binder.withCleanCallingIdentity" into tm-dev am: 3a6a67c5b4 am: 34a6051115 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356864

Change-Id: Ifcd0b9c271685928a416830498093379db219b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:48:24 +00:00
TreeHugger Robot
4c53be5731 Merge "Remove duplicate allowlist entries for Bluetooth" into tm-dev am: 5ea9ade689 am: 0dd6fa2510 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18080601

Change-Id: I9b7152438f425bfb2df090669f697e03e49eb1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:48:08 +00:00
TreeHugger Robot
8512b60834 Merge "Remove vendor apex privapp allowlist pruning" into tm-dev am: 05e61e90c5 am: 966a3b9bb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988646

Change-Id: I16be01ca051593ba99f52751f12efc009163d060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:48:06 +00:00
Jiakai Zhang
b71635bb0e Merge "Only check System UI dexopt status after a mainline update or an OTA." into tm-dev am: 7ed6106f10 am: 5f4054c02d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907961

Change-Id: Id87e4cafa914c832fae67fcfb6cc6309f9a00cac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:47:49 +00:00
Justin Weir
b47ad4a1e2 Merge "Move Volume control Binder calls to worker thread" into tm-dev am: 6f8b2f6da2 am: ac77cec733 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350527

Change-Id: I9e192fbf04d00e6700016e63dd526c2dbf82a40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:47:33 +00:00
Winson Chiu
6006b2b531 Merge "Generalize canPackageQuery error message" into tm-dev am: 96ad5ccad9 am: 808aa0df7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18358288

Change-Id: Ia886f6fcd244be2780c03b8c5edef28b66080dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:47:22 +00:00
Songchun Fan
2db88652e6 Merge "[AppsFilter] fix cache lock and rebuild cache if needed" into tm-dev am: cd1a10a216 am: 8ea7db28d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18360458

Change-Id: I4fad5d8439fa7097a5e0ef0faeebf5e0074cdd44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:47:10 +00:00
Shan Huang
a1936419b2 Merge "Fix broken animation on two consecutive swipes." into tm-dev am: 8a91edd4a3 am: ff20854f60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17963879

Change-Id: I3dfb28f3820fb276edf3330b8bb287546225df25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:46:57 +00:00
TreeHugger Robot
8700515ec0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e0e88a3637 -s ours am: 9e673cb148 -s ours am: e8337afde5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3533eb1df9c67c19ebd19e25f888431f8daa77e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:46:01 +00:00
Bill Yi
39edc4d33e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42337b7a03 -s ours am: 01b60c3ed2 -s ours am: 565656b6e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0012b596ce0b230135ff18d8f7be2de77ba5460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:45:53 +00:00
TreeHugger Robot
491c881d0b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 59b4e7c766 -s ours am: 43cd498d2b -s ours am: 926c291deb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0fbc287ec6bc5ee6ee8f5a0e0b04de8eac9adac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:45:36 +00:00
Bill Yi
381cdd60b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ce170abf7 -s ours am: 9baa5f2ac0 -s ours am: 07e56b1188 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97887a7e92721f6cfd8ec34e7dc1ff57fff16fd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:45:21 +00:00
Shan Huang
9dd284ba1e Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18407083

Change-Id: I9769b6ac5e746d23cd2801737bd00731cd18580f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:28:32 +00:00
Sudheer Shanka
d0fa6d117b Merge "Update OWNERS for broadcast response related classes." into tm-dev am: 9af0eed1de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18377776

Change-Id: I46f4949332f6958ba780e973db80e22bf409b167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:27:58 +00:00
Sudheer Shanka
8aa21b257c Merge "Group broadcasts occurred within a certain duration into sessions." into tm-dev am: 0a790c6419 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18360308

Change-Id: If54c45ff15790df72f8be4ed0db55f2175d8a2c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:27:35 +00:00
Sudheer Shanka
afba0fb8b1 Merge "Don't consider PACKAGE_USAGE_STATS permission." into tm-dev am: 4bc2075b9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188884

Change-Id: Icad37137d2637d6e62247e2336fae9618e7cb006
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:27:14 +00:00
Yasin Kilicdere
34a6051115 Merge "Puts mPm.onNewUserCreated inside Binder.withCleanCallingIdentity" into tm-dev am: 3a6a67c5b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356864

Change-Id: I236499774c2437567229776fb6476148fcc26736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:26:56 +00:00
TreeHugger Robot
0dd6fa2510 Merge "Remove duplicate allowlist entries for Bluetooth" into tm-dev am: 5ea9ade689 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18080601

Change-Id: Iecbcd8658c4aacef60e6d4bc4f3a1ae1c1d53988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:26:36 +00:00
TreeHugger Robot
966a3b9bb0 Merge "Remove vendor apex privapp allowlist pruning" into tm-dev am: 05e61e90c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988646

Change-Id: I80b6a66804c77ab2e2f8b371cc367429ca4b6910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:26:35 +00:00
Jiakai Zhang
5f4054c02d Merge "Only check System UI dexopt status after a mainline update or an OTA." into tm-dev am: 7ed6106f10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907961

Change-Id: I464cb5f102f40d78aa95a8b6cb2621eb4228a67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:25:54 +00:00
Justin Weir
ac77cec733 Merge "Move Volume control Binder calls to worker thread" into tm-dev am: 6f8b2f6da2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350527

Change-Id: Ieb8fe7ec2da96780248cde687e409370b886ea21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:25:29 +00:00
Winson Chiu
808aa0df7b Merge "Generalize canPackageQuery error message" into tm-dev am: 96ad5ccad9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18358288

Change-Id: I8f3898db8490d00911f3ae443456f3ffa9610d29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:25:07 +00:00
Songchun Fan
8ea7db28d2 Merge "[AppsFilter] fix cache lock and rebuild cache if needed" into tm-dev am: cd1a10a216 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18360458

Change-Id: I4ce1259ff75b8d764b0f167fbdb9633a4413e337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:24:45 +00:00
Shan Huang
ff20854f60 Merge "Fix broken animation on two consecutive swipes." into tm-dev am: 8a91edd4a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17963879

Change-Id: I3d6bdd908f498e8e1b8c0c9348130c72e5c0550a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:24:27 +00:00
TreeHugger Robot
e8337afde5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e0e88a3637 -s ours am: 9e673cb148 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76548048f830a738762309d4a82b7366890a1bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:20:51 +00:00
Bill Yi
565656b6e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42337b7a03 -s ours am: 01b60c3ed2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42fc2b1a186feee3a178edebba1a75fcc8104f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:20:45 +00:00
TreeHugger Robot
926c291deb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 59b4e7c766 -s ours am: 43cd498d2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61681591cba031bba2f91ab53891d9666bd5cc65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:20:24 +00:00
Bill Yi
07e56b1188 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ce170abf7 -s ours am: 9baa5f2ac0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib73fd75e76e939f2001bc200b66aeed60a44f1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:19:59 +00:00
Treehugger Robot
36233bdf3a Merge "Consolidate input OWNERS files" am: 467ebb8379 am: 7845f672bf am: 8992cd567f am: e2754a0ede 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021015

Change-Id: I040ce31d32934c3d9d8aa783bb75ac3822d3982b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 19:58:57 +00:00
Treehugger Robot
e2754a0ede Merge "Consolidate input OWNERS files" am: 467ebb8379 am: 7845f672bf am: 8992cd567f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021015

Change-Id: I72cf7afec5bc77920d8d0714a63709982e66b1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 19:37:38 +00:00