commit | 07c0f71192a0ce6b1a26e7377b43e44b0b758f14 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 10 03:46:45 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:46:45 2020 +0000 |
tree | 5e70eb4979c30f73dec4650c23c033b7576f3989 | |
parent | 8dd590514047e8335c8e57a6cf1d00b11c85476d [diff] | |
parent | 6bf4060ba80f1f12966f711f80f70f5442863b0d [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 0a7335dc60 -s ours am: 6bf4060ba8 -s ours am skip reason: Change-Id Iede8164e8b02f8136c10fdb53033d242d21723cb with SHA-1 18cd1784cf is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1521249 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3521be1e467cffb8caea51e0c45d445613b87ba3