| commit | 4acb742c406481a7714c67965580ccebfc7d668c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Feb 16 23:50:59 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Feb 16 23:51:00 2017 +0000 |
| tree | f704c69a5a595b984e55de4b87c93fc668f2010f | |
| parent | ea2e8dc70527c0c9e1fdeb411806543f1d61d9d5 [diff] | |
| parent | c155c49305e0f9d6821b29270f9c73cd83976735 [diff] |
Merge "resolve merge conflicts of a2989b5078 to nougat-mr1-cts-dev" into nougat-mr1-cts-dev