tree ce8eb15ec1c30922d6f2e4ee29e2884ed2249f1a
parent 6432f6a84d0e42152929b3904c242959b4c0d66a
parent eb7ba88b5b2712c94b22230042ad30b894eb0271
author Xin Li <delphij@google.com> 1485906917 -0800
committer Xin Li <delphij@google.com> 1485906939 -0800

Merge stage-aosp-master into master.

BUG: 34107289
Change-Id: I7910cf453ea67f7029812db1df54bdf1d399c0cd