| commit | 6c821e60aca5a1d61293051c7cbc8b8f1ceb6fc0 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:16 2021 +0000 |
| tree | 3d0afacd5eb20e52180c6f47d25f5a989d4c8dc6 | |
| parent | 477ecb37d5fa1a8ca58e6cf77d8fc6f9af9cca98 [diff] | |
| parent | 9e3cede5cf230d9306312d3d40921668582b3272 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 52f5948bab -s ours am: 94d094a2b1 -s ours am: 9e3cede5cf -s ours am skip reason: Merged-In I3e40d130df3221e2b73e1f138bd78389ba2abe70 with SHA-1 28ced5f1d7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1847670 Change-Id: I9936a3eac58497f7e54184499d9bc04d40696e03