| commit | 24657552b4a2c2ce8823a63b28d7089da922d399 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Dec 01 01:38:55 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 01 01:38:55 2016 +0000 |
| tree | 6d55a010fe25826f4cb2c77c751ebb08354681f2 | |
| parent | 6d17da566bac4fc46beb7d6cc4085b94e8d6a71d [diff] | |
| parent | b75e569eadba94a86fec763cc93a5b4e896331f7 [diff] |
Merge "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" into nyc-mr2-dev-plus-aosp