| commit | 36b94fbfb5140658eded844d6df419c0cbccdf29 | [log] [tgz] |
|---|---|---|
| author | Tomasz Mikolajewski <mtomasz@google.com> | Thu Dec 01 01:16:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 01 01:16:49 2016 +0000 |
| tree | 41810c23e8a2e8df3a306ff4b722587170b20723 | |
| parent | 1e6118bc21baac28347d7433bee68cc2f92a26de [diff] | |
| parent | bdc926e5574f4faf421ea04a341be9424de80f9b [diff] |
resolve merge conflicts of 14afdcf to nougat-cts-dev am: d640e59d1d am: dbb1abc9b0 am: bdc926e557 Change-Id: I21fe18f64c01d8922761ab2819847e08b703972a