tree 768e14771154e4ce3f2031fcb02fb603c243efd6
parent b0e5b30f130626e5d13dd3c65806a787dd878baa
parent df28bb8ddf35defcf1703ba4ca40256e71737d6a
author Bill Yi <byi@google.com> 1481067851 +0000
committer android-build-merger <android-build-merger@google.com> 1481067851 +0000

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

Change-Id: I8651d7ebd3694ac715dcaac6f46d7094c5e327eb