tree 074f806f35a6647560d9cfa6a5b1765cccea5661
parent 77ffdc15d9a85c091bdcf138c74ad091767b91e7
parent c8d7d85d609e0a4ed72091fbbbc91fd1b44fff16
author Xin Li <delphij@google.com> 1598998217 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998217 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 506f871568 -s ours am: 9ae09d5cb8 -s ours am: c8d7d85d60 -s ours

am skip reason: Change-Id Ie2951b1e4958f911d8d5f90095dce15a5a5d0776 with SHA-1 273c5f93e3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/hardware/interfaces/+/12470202

Change-Id: I5195c207c423e3abc3a3e8be8108e00aac0308a6