| commit | bbc8ff259a0b079417c374e047b3d0085f8b1582 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:21 2021 +0000 |
| tree | 14a8728963df89ea2c20d106ef63290913f3fa3d | |
| parent | 260cbdfab6fae6da1aacc2457b208cc9f04ba306 [diff] | |
| parent | be0b993faeb51c0a12a4b387700cbd8bb33bdca4 [diff] |
[automerger skipped] Merge "Merge Android 12" am: c03b0fa033 -s ours am: c259e66801 -s ours am skip reason: Merged-In Iba1443da42161f4a41830081f2e1985b30444cc0 with SHA-1 ee05ff24d8 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1847122 Change-Id: Ie051fa26cd626cb4d9a5a9e54ca3e42a340dc024