tree 7e14fbebc9496fb4a4d45a0254704eb2e47fc9ee
parent 0c14ecd396d06b8ee1d6d1befbfba67d084e4fda
parent 60f3ab275ef3ddf3afcdfdce4eb09b59024fec51
author Chavi Weingarten <chaviw@google.com> 1607545388 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607545388 +0000

resolve merge conflicts of cae2ee036040fc0dce9fc82af9bf8d85240d566b to rvc-dev am: 60f3ab275e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1ac5da1bbaa987ae2debb868c41b2999f45e973