tree 648010c428c8b0a0d747b19eea89a9ad93eae347
parent 1b38b4cd8f637c73cde4a033a0cee0fa8653fb3d
parent 8eb870d1741bb2bd651b05c516b3c892d55fff37
author Xin Li <delphij@google.com> 1534983845 -0700
committer android-build-merger <android-build-merger@google.com> 1534983845 -0700

Import db1858f6b9dec7ff54adf144f378679b405b8509 into master.
am: 8eb870d174

Change-Id: Ia181a5ab592450fcc8b1e1041b838871133e5ae3