| commit | 8e6c1949e489a7f68ea27f4356a27b6fc117263a | [log] [tgz] |
|---|---|---|
| author | Tomasz Mikolajewski <mtomasz@google.com> | Thu Dec 01 01:05:22 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 01 01:05:22 2016 +0000 |
| tree | 0c8d8b337a777849f5ae5d7934cccc40d813e5d6 | |
| parent | dbb1abc9b031e197d523037af7fa4631bf18b01a [diff] | |
| parent | 24e2c82765a40cb9b22903dbe96870cfeb18473a [diff] |
Merge "resolve merge conflicts of 14afdcf to nougat-cts-dev" into nougat-cts-dev am: 24e2c82765 Change-Id: I05c2ccba6db2f57388898aa5235b67ddc793e800