| commit | a75b9016f1d6ebf3a13f25b0b2226deefbad7984 | [log] [tgz] |
|---|---|---|
| author | Chenbo Feng <fengc@google.com> | Mon Jul 17 21:18:55 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 17 21:18:55 2017 +0000 |
| tree | 24c9459fa0fb6a44e55ad226158c9d1dcc4f50b8 | |
| parent | ba9c18e7af88a47c7230277850cc594d17d15b80 [diff] | |
| parent | e2753dbabb8c9ce1d24eb2cf8c26fefc5b859bb0 [diff] |
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 26339f2d77 am: e2753dbabb Change-Id: Iba9cee9b7ffc67fa836e58eb547dd00b3b491321