tree 9c75452dde0a4bd533511398eb3a4cd4845db50d
parent bcd4d930bcff6696ed9d7fc4b4853e278c7ba42b
parent 93a76f8e4091b9eec9f704bbc7e62404182c34f2
author Xin Li <delphij@google.com> 1606969531 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606969531 +0000

[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 93a76f8e40 -s ours

am skip reason: Change-Id I78222391b83a4add8e964340ec08bb8a1306e1c6 with SHA-1 07ec9b4dcb is in history

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

Change-Id: I72cd2486ff8473dcbdef76bc855e4fe45927b943