tree 467a89aee76d376ae15b3f1c92b37e28343cfc65
parent 546f68a66fcbf2de9a3a816b6b15f612453a801e
author Sunny Shao <sunnyshao@google.com> 1573739585 +0800
committer Sunny Shao <sunnyshao@google.com> 1573739585 +0800

Synced the code from master branch

Fixes: 144364245
Test: compilation
Change-Id: I1c6981128f3f2fe5ae36e83a289c226ac59be742
Merged-In: I72d37db133fdabb0eef1b332f1128b4fb23ea866