commit | 9e3cede5cf230d9306312d3d40921668582b3272 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:01 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:01 2021 +0000 |
tree | 5f381f53d877b757f8e1b35560b1c2d0bbc2c9e3 | |
parent | 79403df5e9ac24f5f8d479e56e06012b76bccd64 [diff] | |
parent | 94d094a2b155a0fcf7e29765f2ca9ab5b6ea999f [diff] |
[automerger skipped] Merge "Merge Android 12" am: 52f5948bab -s ours am: 94d094a2b1 -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: Idf49c7467f7b08027cbf1bd25f21e88318ff972f