| commit | b2aba6dcde36d5e2493082ea567bc06652eb7a5b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Mar 08 11:06:26 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 08 11:06:26 2022 +0000 |
| tree | 54dd3ccde06cfffd556d2cdb81149306c2386cf5 | |
| parent | 42fcd1d2b0ca7a0cb5ac2c1c130a949e5645d67f [diff] | |
| parent | 47ba7a8d41a310198831fd7bed713c3d194ca895 [diff] |
[automerger skipped] Merge "Merge Android 12L" am: dd488b2684 -s ours am: 47ba7a8d41 -s ours am skip reason: Merged-In I1487ce9826e077bdd889c9d1c8fd3e8ea0344dd9 with SHA-1 acb6e110d2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2012834 Change-Id: I549f19429915e1d2256156ebdd88a395eaa4930d