tree 8a617bef3ebde38e8841368324d2efd2ef19fd7d
parent 8494c1421835d1e72743f6b16f377169ea945f97
parent 769c2b61d5feeafb84b2ed7f436cc0a07b77b64b
author Yabin Cui <yabinc@google.com> 1605130919 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605130919 +0000

Merge changes Ice7f465a,I3eb2bee8 am: 769c2b61d5

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1495439

Change-Id: I975b5cc425cebe691ec73662aee6340864475757