| commit | bdc926e5574f4faf421ea04a341be9424de80f9b | [log] [tgz] |
|---|---|---|
| author | Tomasz Mikolajewski <mtomasz@google.com> | Thu Dec 01 01:11:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 01 01:11:18 2016 +0000 |
| tree | ba11582d75c7d49eadd9a192e22f854e6ef18749 | |
| parent | df1cb8526d8b607b29f65265c1ca6e723322af76 [diff] | |
| parent | dbb1abc9b031e197d523037af7fa4631bf18b01a [diff] |
resolve merge conflicts of 14afdcf to nougat-cts-dev am: d640e59d1d am: dbb1abc9b0 Change-Id: Ib940a413e1e0ea1fee3a6d42af24369b436730bd