tree 5e70eb4979c30f73dec4650c23c033b7576f3989
parent 18cd1784cf218a664d29f3e18aa76838c73c46aa
parent 0a7335dc602899dfac7f63d5b3f4a1846b956e13
author Xin Li <delphij@google.com> 1607569496 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607569496 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 0a7335dc60 -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: I846e8d24bbcfd454c94335a913ae7471b3df1bf7