Treehugger Robot
3bcbb32014
Merge "Add KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY" am: c845883448 am: 4a4b536059 am: fbc2bcad4a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200209
Change-Id: I4425d9cf01021c3dfceffe9cc35be0b5a549d8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 20:13:18 +00:00
Treehugger Robot
fbc2bcad4a
Merge "Add KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY" am: c845883448 am: 4a4b536059
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200209
Change-Id: Ifdf884b81d058af80ea80a1797a8c590ef4a5169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 19:28:31 +00:00
Treehugger Robot
4a4b536059
Merge "Add KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY" am: c845883448
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200209
Change-Id: I31199f32986a3ffd56f8dcf84f873830c9e38364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 18:32:18 +00:00
Treehugger Robot
c845883448
Merge "Add KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY"
2022-09-02 17:54:03 +00:00
Automerger Merge Worker
112ffc8995
Merge "Merge "Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into tm-dev am: 1bcaa0dd8b am: 5c55e68dbb" into tm-d1-dev-plus-aosp
2022-09-02 17:44:03 +00:00
Ganesh Olekar
533262ddcf
Merge "Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into tm-dev am: 1bcaa0dd8b am: 5c55e68dbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500970
Change-Id: Iad594d54d22f43c0578ac8ccf7fe3345f3525ff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 17:43:43 +00:00
Ganesh Olekar
3cc822b9b3
Merge "Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into tm-dev am: 1bcaa0dd8b am: 632d2ff270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500970
Change-Id: I3b411c019822d86d317fa9d1f8e915f0e83b2f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 17:43:37 +00:00
Ganesh Olekar
5c55e68dbb
Merge "Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into tm-dev am: 1bcaa0dd8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500970
Change-Id: I79558bec41b3e17de91b3c1fb52fe8d560d37ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 17:14:23 +00:00
Ganesh Olekar
632d2ff270
Merge "Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into tm-dev am: 1bcaa0dd8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500970
Change-Id: I1ae54c7d2e89cef5486192f4f7e8549f55d950b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 17:11:43 +00:00
Ganesh Olekar
1bcaa0dd8b
Merge "Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into tm-dev
2022-09-02 16:41:40 +00:00
Colin Cross
c64feda57f
Merge "Switch else case to null in when expression to make it exhaustive" am: 83026726de am: ea9e108e4e am: 9a7c74476c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200210
Change-Id: I163f547448a5ef3ad1d027ba4355e08171cd0f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 15:51:32 +00:00
Colin Cross
9a7c74476c
Merge "Switch else case to null in when expression to make it exhaustive" am: 83026726de am: ea9e108e4e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200210
Change-Id: If8758b2c5d0555d221ed5a7bc898608a94ca6822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 15:23:34 +00:00
Colin Cross
ea9e108e4e
Merge "Switch else case to null in when expression to make it exhaustive" am: 83026726de
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200210
Change-Id: I3aa75a986f55269dc33a384602062fb7318fed53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 14:50:07 +00:00
Colin Cross
83026726de
Merge "Switch else case to null in when expression to make it exhaustive"
2022-09-02 14:16:36 +00:00
Chiachang Wang
fc24e0777b
Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" am: a03fa63d19 am: a50c41b050 am: fea2f221ed
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200896
Change-Id: I57c9d20845e2080a0cb9c63975fe1d4e1ca18a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 13:40:14 +00:00
Chiachang Wang
fea2f221ed
Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" am: a03fa63d19 am: a50c41b050
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200896
Change-Id: I600dc5f51430b2702cbb13af066e458e190561fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 13:10:42 +00:00
Chiachang Wang
a50c41b050
Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" am: a03fa63d19
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200896
Change-Id: Ie3910c0117a77413e6c59d02315590354b2a8447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 12:36:28 +00:00
Chiachang Wang
a03fa63d19
Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile"
2022-09-02 12:15:09 +00:00
SongFerng Wang
fc3adb942d
Merge "Add owner for job handover" am: a3d5929306 am: 35c2e10af3 am: 24c7423452
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2203113
Change-Id: I7c0444d19abea3120f24edbed3f3652147eef823
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 08:56:14 +00:00
SongFerng Wang
24c7423452
Merge "Add owner for job handover" am: a3d5929306 am: 35c2e10af3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2203113
Change-Id: I327bad9650e13b442a9141786ff4106e6a9596bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 07:56:08 +00:00
SongFerng Wang
35c2e10af3
Merge "Add owner for job handover" am: a3d5929306
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2203113
Change-Id: Ib3ad83a7404d209a5b9ea6ee4445513aaef47932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 07:26:23 +00:00
SongFerng Wang
a3d5929306
Merge "Add owner for job handover"
2022-09-02 06:46:16 +00:00
Cole Faust
645e261b33
Merge "Fix module-file name collisions" am: 92f4e14b94 am: b88cb3e1ce am: 1d4139e72d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2202594
Change-Id: Ie6c21973d6ea80e0cb012adfa91b9c9c2e07e29d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:49:33 +00:00
Cole Faust
1d4139e72d
Merge "Fix module-file name collisions" am: 92f4e14b94 am: b88cb3e1ce
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2202594
Change-Id: If079a0c7efb8ad63d7b4649f892ff8d8cd627e53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:47:43 +00:00
Automerger Merge Worker
22956fd5ad
Merge "Merge "Revert "Validate package name passed to setApplicationRestrictions."" into sc-v2-dev am: c448026af5 am: f2c91e4cd3 am: 3e2ccce0d8" into tm-d1-dev-plus-aosp
2022-09-02 04:47:42 +00:00
Eva Tsai
93be0488a9
Merge "Revert "Validate package name passed to setApplicationRestrictions."" into sc-v2-dev am: c448026af5 am: f2c91e4cd3 am: 3e2ccce0d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816835
Change-Id: I87eb3eb5316a89dd05ac0691ea2394ec71e9d046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:47:21 +00:00
Eva Tsai
a60e0a04d7
Merge "Revert "Validate package name passed to setApplicationRestrictions."" into sc-v2-dev am: c448026af5 am: f2c91e4cd3 am: 3b978d25b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816835
Change-Id: If7a71b81a5253f61b22b844725ef33b390f1aa5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:47:20 +00:00
Eva Tsai
3b978d25b4
Merge "Revert "Validate package name passed to setApplicationRestrictions."" into sc-v2-dev am: c448026af5 am: f2c91e4cd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816835
Change-Id: I6aed93c49f31ef206eeb42624587420840350202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:16:26 +00:00
Cole Faust
b88cb3e1ce
Merge "Fix module-file name collisions" am: 92f4e14b94
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2202594
Change-Id: I7fa8f72390addef7dc603fc92921363173285995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:14:10 +00:00
Eva Tsai
3e2ccce0d8
Merge "Revert "Validate package name passed to setApplicationRestrictions."" into sc-v2-dev am: c448026af5 am: f2c91e4cd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816835
Change-Id: Icf6c9bb02785326477af1ba790e45688832e9d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:13:38 +00:00
Automerger Merge Worker
bd741231a1
Merge changes from topic "am-e32d35e3d2634480a5b87af5e15839c4" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-qpr1-dev am: 96f963e6e3 -s ours am: d93b150b77 -s ours am: db0ccc1771 -s ours am: 89119b32f7 -s ours
[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: 4bdb5f9859 -s ours am: 119ed2c9af -s ours am: 3458f9d2c1 -s ours am: 570887bdc6 -s ours
2022-09-02 04:02:33 +00:00
Yuri Lin
98cf92a637
[automerger skipped] Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-qpr1-dev am: 96f963e6e3 -s ours am: d93b150b77 -s ours am: db0ccc1771 -s ours am: 89119b32f7 -s ours
...
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744481
Change-Id: I9650e586a4d4ba1c557a6ec325c5e614da4accdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:02:25 +00:00
Yuri Lin
0a8c4a38de
[automerger skipped] Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-qpr1-dev am: 96f963e6e3 -s ours am: d93b150b77 -s ours am: db0ccc1771 -s ours am: 26e1f6cc2b -s ours
...
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744481
Change-Id: If353799f8414b2c2b30b53b7eb66c8d6a7c0ac2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:02:23 +00:00
Yuri Lin
135e9cc015
[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: 4bdb5f9859 -s ours am: 119ed2c9af -s ours am: 3458f9d2c1 -s ours am: 0fffac1c8a -s ours
...
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744481
Change-Id: Ic5c64246395959789b6497eeffee732728045238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:02:21 +00:00
Yuri Lin
0e6dc6beae
[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: 4bdb5f9859 -s ours am: 119ed2c9af -s ours am: 3458f9d2c1 -s ours am: 570887bdc6 -s ours
...
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744481
Change-Id: I26b461a4325229865aacf82146f8ef0f75fdfc2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:02:06 +00:00
Cole Faust
92f4e14b94
Merge "Fix module-file name collisions"
2022-09-02 03:47:45 +00:00
Eva Tsai
f2c91e4cd3
Merge "Revert "Validate package name passed to setApplicationRestrictions."" into sc-v2-dev am: c448026af5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816835
Change-Id: I328d0c25c77ee80bf0a24284e8cd51dcc59b288e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 03:43:53 +00:00
Yuri Lin
89119b32f7
[automerger skipped] Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-qpr1-dev am: 96f963e6e3 -s ours am: d93b150b77 -s ours am: db0ccc1771 -s ours
...
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744481
Change-Id: Ie23bdc63447765ba5bf427f15c57e844ff619cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 03:32:08 +00:00
Yuri Lin
570887bdc6
[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: 4bdb5f9859 -s ours am: 119ed2c9af -s ours am: 3458f9d2c1 -s ours
...
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744481
Change-Id: Ic79a2b77659d43b5811f71c688e9053d3ee3c7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 03:32:06 +00:00
Yuri Lin
26e1f6cc2b
[automerger skipped] Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-qpr1-dev am: 96f963e6e3 -s ours am: d93b150b77 -s ours am: db0ccc1771 -s ours
...
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744481
Change-Id: I2455bf487e596700731dfb4487a2313e9144c52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 03:29:40 +00:00
Yuri Lin
0fffac1c8a
[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: 4bdb5f9859 -s ours am: 119ed2c9af -s ours am: 3458f9d2c1 -s ours
...
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744481
Change-Id: I13f7f3cc7cfe22bf39e2937c3f417c5e736f1988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 03:29:21 +00:00
Eva Tsai
c448026af5
Merge "Revert "Validate package name passed to setApplicationRestrictions."" into sc-v2-dev
2022-09-02 03:22:40 +00:00
Eva Tsai
623f456d0b
Revert "Validate package name passed to setApplicationRestrictions."
...
This reverts commit 8c2c7b4164 .
Reason for revert: DroidMonitor-triggered revert due to many breakages in Quarterdeck
Bud: b/244643688
Change-Id: I6178eb0f9d2e7fb602694d7266be9aa58008ce96
2022-09-02 02:59:44 +00:00
Yuri Lin
db0ccc1771
[automerger skipped] Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-qpr1-dev am: 96f963e6e3 -s ours am: d93b150b77 -s ours
...
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744481
Change-Id: Id24568e13ab880049ed971740b6e477b12fd29b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 02:59:24 +00:00
Yuri Lin
3458f9d2c1
[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: 4bdb5f9859 -s ours am: 119ed2c9af -s ours
...
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744481
Change-Id: I94434170f75d4b4569cc1b6a919385d0f753fe98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 02:58:56 +00:00
Chris Li
30c9768b66
Merge "Expose state of ignoring orientation" am: 47653ee99d am: 4f49e133f6 am: 14ac88f4b5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2173785
Change-Id: I8c991fbd9a9568bce4886e3333c981690bd92083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 02:52:56 +00:00
Mikhail Naganov
78f025d2fe
Merge "Visualizer: use actual sampling rate of the instance" am: ff525f4748 am: 61940da881 am: 8c6ec7de71
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200211
Change-Id: Iae85ea19bbd3afb20a4d11a3a1bbe57dc14866f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 02:52:29 +00:00
chiachangwang
29348dbfca
Correctly handle null ProxyInfo in Ikev2VpnProfile
...
This change ensures that null ProxyInfo instances are honored
and reflected in the actual VpnProfile.
Ikev2VpnProfiles incorrectly set ProxyInfo as an empty instance
when provided with a null ProxyInfo. Other components in the
system sometimes have different behavior if presented with an
empty ProxyInfo instead of a null one.
Bug: 244281603
Test: atest FrameworksNetTests
Test: Manual testing with VPN validation enabled
Change-Id: I67ee2aa5c96dc22ba8fcd2be3fd4c090dec20697
2022-09-02 02:51:33 +00:00
Automerger Merge Worker
7c21dc2941
Merge "[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: fcc640c578 am: b5e74c1c7e -s ours am: 8cfe99d2e5 -s ours am: 167fa8ba83 -s ours" into sc-dev am: 8449f44bcf -s ours am: 06162daec1 -s ours am: 7396c4d437 -s ours am: 82d9abd044 -s ours am: d5706b15e0 -s ours
...
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744482
Change-Id: I140737591a7da45b34ed773b9b1d17ca705b3975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 02:50:15 +00:00
Yuri Lin
453083491e
[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: fcc640c578 am: b5e74c1c7e -s ours am: 8cfe99d2e5 -s ours am: 167fa8ba83 -s ours am: 8583d6eac1 -s ours am: a09891ec59 -s ours am: 111e477aa5 -s ours am: 1e2ea3c022 -s ours am: c32db9acb3 -s ours
...
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 3201baad70 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744482
Change-Id: I15630e363a36401b7e67bca5f4b7053cd9f34c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 02:50:06 +00:00