| commit | f1b2e36f3521fef57e80c54f07a15f63930e852d | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Apr 08 19:14:29 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 08 19:14:29 2022 +0000 |
| tree | 0bdd54cf5fc4fa3db2b4205953ffa47e99b3ffbc | |
| parent | 9bacfa1b44c03aa3d0ed069d54395f6a9c0e8300 [diff] | |
| parent | f2b5cf274c67691ac0daa02a6a936ab598ff379a [diff] |
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 95267eaf87 -s ours am: f2b5cf274c -s ours am skip reason: Merged-In Iae1a66165221f45051be17c4d047b5bd5be3999b with SHA-1 c7fda7b570 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2058929 Change-Id: I848c480a986304ead94f98c46b35c7a9ff0779a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>