| commit | b75e569eadba94a86fec763cc93a5b4e896331f7 | [log] [tgz] |
|---|---|---|
| author | Tomasz Mikolajewski <mtomasz@google.com> | Thu Dec 01 01:38:40 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 01 01:38:40 2016 +0000 |
| tree | 6d55a010fe25826f4cb2c77c751ebb08354681f2 | |
| parent | 2378fa02610992365ccd46694b5b182858a7280e [diff] | |
| parent | 3d87193981c1eccaef58142225d0a3db3e55b749 [diff] |
Merge "resolve merge conflicts of 14afdcf to nougat-cts-dev" into nougat-cts-dev am: 24e2c82765 am: 8e6c1949e4 am: efc4b6e52b am: 76b5c7123d am: 90b9b93022 am: 3d87193981 Change-Id: Iae59ee2ce57cff5ca395e39a36939eb129a5f914