tree dd4ed4f55de937e63bdd649a4e29a2c5bf819703
parent 3615221bfd254314642899c19b6152906809cff0
parent 063c1723a6c2c0259fde18efa969cbbd62dcc73b
author Xin Li <delphij@google.com> 1588103546 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588103546 +0000

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

Change-Id: Id00ea78fa38c23a3eacc581af38f02be7f39630b