| commit | efc4b6e52ba83942e6a8fd71007876a3ddc9b47b | [log] [tgz] |
|---|---|---|
| author | Tomasz Mikolajewski <mtomasz@google.com> | Thu Dec 01 01:11:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 01 01:11:41 2016 +0000 |
| tree | ba11582d75c7d49eadd9a192e22f854e6ef18749 | |
| parent | bdc926e5574f4faf421ea04a341be9424de80f9b [diff] | |
| parent | 8e6c1949e489a7f68ea27f4356a27b6fc117263a [diff] |
Merge "resolve merge conflicts of 14afdcf to nougat-cts-dev" into nougat-cts-dev am: 24e2c82765 am: 8e6c1949e4 Change-Id: Ib543cc2450656e6820f5ec131a063d135142421c