tree b88b48e3ab92a9816735758b1e961ae3e426148e
parent 413cad430aa8eee0520175d7fd2b520a8bf00288
parent f821a8a8cf35be2a860b41b8886ff31679fef1b1
author Jordan Liu <jminjie@google.com> 1592002519 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592002519 +0000

Merge "Fix bad merge of aosp/1220298" into rvc-dev am: 2482177cec am: f821a8a8cf

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

Change-Id: I0e9f7f96cc7bc5fe3d10aed52a4ba5362e1deca8