tree 768e14771154e4ce3f2031fcb02fb603c243efd6
parent f10543b3b5fbbfd478402cf418e2bf3b4742075b
parent 4033cc718c609feb4906281c3d992041ffd69193
author Bill Yi <byi@google.com> 1481068092 +0000
committer android-build-merger <android-build-merger@google.com> 1481068092 +0000

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 0bff4a1296 am: df28bb8ddf
am: 4033cc718c

Change-Id: I3ea15643bbabf94be2fdccb2982459aa8b284f45