| commit | f715c988a2f49439ee7aefbc6919cad00e04d3ec | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Aug 03 01:38:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 01:38:50 2023 +0000 |
| tree | 959e5b4bb8ac0eae2fd64c9db9ebc64f9d510c83 | |
| parent | d2983b8a0e13e7f5c3d95a9182479fa942fae246 [diff] | |
| parent | d892ae179e1a400368796cca19e216fd296531d1 [diff] |
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I22bf5e8f7e2d28e4b8bf48fdfeaedaf7b585cf2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>