tree ce8eb15ec1c30922d6f2e4ee29e2884ed2249f1a
parent 6432f6a84d0e42152929b3904c242959b4c0d66a
parent 03aa215cccab68da5fdfe000029201982edebe68
author Xin Li <delphij@google.com> 1484181221 -0800
committer Xin Li <delphij@google.com> 1484182510 +0000

Merge commit '03aa215cccab68da5fdfe000029201982edebe68' into
stage-aosp-master.

BUG: 34107289
Change-Id: I8ea0b5cce44fb48d51c7e3e4ce7a5dca755c476a