diff options
author | Xin Li <delphij@google.com> | 2020-09-11 02:03:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 02:03:11 +0000 |
commit | e6da4c3c1a539b631f7e3186f61999eab09ce637 (patch) | |
tree | 827c59191f3400d95376eff28d2c46cfb6b50438 | |
parent | 54c0df13759b1b78094ce305b00a44c6858b2c6a (diff) | |
parent | cf4ce693c3f18942c756dd311fb259787d0dbb8f (diff) | |
download | ex-e6da4c3c1a539b631f7e3186f61999eab09ce637.tar.gz |
[automerger skipped] Merge "Merge Android R" am: 739338354e -s ours am: cf4ce693c3 -s ours
am skip reason: Change-Id Ib391ecc430a25955b3b35df957a96640fed9a70c with SHA-1 9ac0f46277 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/1422366
Change-Id: Id9252353daaada058fa9c8b61cea259959a70d77
0 files changed, 0 insertions, 0 deletions