| commit | ddd85c18bcc9e141d725cd469e0773618927e217 | [log] [tgz] |
|---|---|---|
| author | Daniel Cashman <dcashman@google.com> | Fri Jul 24 23:44:10 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jul 24 23:44:10 2015 +0000 |
| tree | 9a7f55d2b4d7093746e563c5ad4d4b0f69ba81c0 | |
| parent | 516e3b2c03fc5f64f0d12c4b2f0fb6c80a9b8477 [diff] | |
| parent | f9bacbdfbae2d00e4c7535b74c0736b757f57702 [diff] |
Merge "resolve merge conflicts of 950a898 to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev