| commit | 4033cc718c609feb4906281c3d992041ffd69193 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Dec 06 23:44:11 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 06 23:44:11 2016 +0000 |
| tree | 768e14771154e4ce3f2031fcb02fb603c243efd6 | |
| parent | b0e5b30f130626e5d13dd3c65806a787dd878baa [diff] | |
| parent | df28bb8ddf35defcf1703ba4ca40256e71737d6a [diff] |
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 0bff4a1296 am: df28bb8ddf Change-Id: I8651d7ebd3694ac715dcaac6f46d7094c5e327eb