| commit | 6dc384b585f4867d4f5c7a3c16a009aada48dd8c | [log] [tgz] |
|---|---|---|
| author | Ross Yeh <rossyeh@google.com> | Mon May 21 17:14:32 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon May 21 17:14:32 2018 +0000 |
| tree | e235420bba4091b72d8069e461d2487febe86cd2 | |
| parent | 634f178e4cf29614bfeff6641ac92bf714b117da [diff] | |
| parent | cd517a2203c91c1a1f90d7d5e01b804a1b18541e [diff] |
Merge "resolve merge conflicts of cedcbbd0278dfec5d40e152c5ea822e671d0e8e1 to nougat-cts-dev" into nougat-cts-dev