tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 86c7559a3a0b23a92ba5b48c671080f989df1482
parent 2762228356acc87642d30fded017940ddc801087
author Stephen Li <stephenli@google.com> 1512689129 +0000
committer Stephen Li <stephenli@google.com> 1512689129 +0000

Manually merge changes from giant AOSP topic

Change-Id: I658f8f515c4fd7fe567869d8ce145b6f53081ffc