tree 827c59191f3400d95376eff28d2c46cfb6b50438
parent 92987a284d9e719e8c869b73d6aedf4d31a9e31b
parent e6da4c3c1a539b631f7e3186f61999eab09ce637
author Xin Li <delphij@google.com> 1599795242 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795242 +0000

[automerger skipped] Merge "Merge Android R" am: 739338354e -s ours am: cf4ce693c3 -s ours am: e6da4c3c1a -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: I3bc85fa0734f9ce66699dbe690382b3630e158f2