tree 0584aae4947e5b4081e554e8848048677d4e936e
parent 25d2ee9e66508b4a2a9cb4ba005d0f92d545651f
parent 22c42d573e841bc37ef51931453ef5d8780c5dad
author Lucas Lin <lucaslin@google.com> 1614712435 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614712435 +0000

Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0332bf0bf07a0a958c2e75b464d577021fd57746