tree ce8eb15ec1c30922d6f2e4ee29e2884ed2249f1a
parent 980da0fc0f0360bda2eb6664e04d16800d8f7817
parent 9aba58bff75195578f01e194a171602f9e6dbd67
author Xin Li <delphij@google.com> 1485913912 +0000
committer android-build-merger <android-build-merger@google.com> 1485913912 +0000

Merge "Merge stage-aosp-master into master."
am: 9aba58bff7

Change-Id: Iec13159cb09e5cafe1019231e4351692c3a19f41