tree 279e9e692e3a7db704f65e6d3977e43e8e75b46a
parent 5d78951d5bc7bad54082b1083c2dc7f3b9fae89d
parent 0fa01c38cc2beff8d7e11e4b512692ecdb640ca8
author Sen Jiang <senj@google.com> 1534280552 -0700
committer android-build-merger <android-build-merger@google.com> 1534280552 -0700

Merge remote-tracking branch 'aosp/upstream-master' into aosp/master.
am: 0fa01c38cc

Change-Id: Ifc725167753e0e2c9d5a7f966c70fa22329166e3