tree dd4ed4f55de937e63bdd649a4e29a2c5bf819703
parent 62a8e9a84245b43458c4aea406c41b9d7c0f17a6
parent b0ad11e60a26c1f791ba0d9584e83b5a59720b44
author Xin Li <delphij@google.com> 1588103480 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588103480 +0000

Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: b0ad11e60a

Change-Id: I52bbe5e34f427aa1ff3c8d827e9731f8ddd55e01