tree c3bf7dcbc0a83a1f19ac9f2e77bd89e5050f3e91
parent e6c9959fe4431af6fb3b054deba2581375120ba4
parent 5eb1be561420ec881e32cc01de46f697b2dba3bb
author Xin Li <delphij@google.com> 1485906856 -0800
committer Xin Li <delphij@google.com> 1485906886 -0800

Merge stage-aosp-master into master.

BUG: 34107289
Change-Id: I69366a5c8d0334c30bc51df7ba95eb086710ed45