tree f763febaacffc4b884f08e43f32819fed8e4289b
parent 7efe0bf656cd29250cc49c331d851956b836087a
parent 05ca3f4d04b0e9bb673d1d59b764005cddbe98ce
author Xin Li <delphij@google.com> 1588094255 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588094255 +0000

Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04

Change-Id: I108069a860bedb0edc799f6b1bef61f4c600f94a