tree 357180f94c474203a7cc93b0b1c4119094a9eab1
parent 0b3e045a36902744c2a2881afd72012c83b8a112
parent b13bd0e90eb3cbead2cbab20cbff9465be393d42
author Matt Casey <mrcasey@google.com> 1591822588 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591822588 +0000

Merge changes I93d05034,Ic052133c into rvc-dev am: b13bd0e90e

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

Change-Id: Idbc9969cebcdaf16fe522be241ead6a1b735de96