tree 074f806f35a6647560d9cfa6a5b1765cccea5661
parent dd7a0d39e0a6631f10f7eea77b9002250ee0f772
parent 5ea074e31176bd998b10e502998b388a98377f68
author Xin Li <delphij@google.com> 1599796760 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796760 +0000

[automerger skipped] Merge Android R am: f733fa98d3 -s ours am: 9f00817f93 -s ours am: f4fe381229 -s ours am: 5ea074e311 -s ours

am skip reason: Change-Id Id97fbe726deb852052296030894ccad6d02de37b with SHA-1 506f871568 is in history

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

Change-Id: Iad3cfb8a53aa42171a3027b7b2acacc4eb6c9768