| commit | 1b247e283b80395a4b0c9bb006fd662eb8539592 | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Tue Jan 16 21:28:09 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jan 16 21:28:09 2018 +0000 |
| tree | 4dd5a740d098b26800c36a8da239cf1975d78559 | |
| parent | 6379be39c06b6c4ec9d5ac52dda42853815f3310 [diff] | |
| parent | 2caed04dbd17863472b79db48f728db5d533ffd4 [diff] |
Merge "Merge "resolve merge conflicts of fa2e5aafdfeff8200139b94f380d21cfbb45c5cb to nougat-cts-dev" into nougat-cts-dev am: d3fea17243" into nougat-mr1-cts-dev