| commit | 87db7a7c5e9ad58d2137d33997502815d394b678 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:59 2021 +0000 |
| tree | 8a341bc9633a078bd01b5d1f27b5ad723b5e5925 | |
| parent | 45c57b581855fe3738cbae09fa4c8787e75e6b03 [diff] | |
| parent | 696c17aedc408d659fd1f67ca7e09bc89cf6ad02 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 9044c51dd8 -s ours am: 696c17aedc -s ours am skip reason: Merged-In Ied4e7a153b46e23aaca665b7812fafb2449357e2 with SHA-1 d388fa6ead is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/1847574 Change-Id: I7458315a117e170b3e32152b0174f43d547be416