tree 88487e67560f9a1f8dbf16ea82eac269a0ac846a
parent 363d8831110c585f70bcb8699ed1485cc2332912
parent 5e9689a6a25ab8ecb787f29f960b78aa1467123a
author Stephen Li <stephenli@google.com> 1512689431 +0000
committer Stephen Li <stephenli@google.com> 1512689431 +0000

Manually merge changes from giant AOSP topic

Change-Id: Icd4e79ad36859d4d51438f385fd9b1a194943233