| commit | 531d76e04d96f63ebb99281bda2f7e793fbd08d3 | [log] [tgz] |
|---|---|---|
| author | Stuart Scott <stuartscott@google.com> | Tue Feb 16 19:57:37 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 16 19:57:37 2016 +0000 |
| tree | 67f73fb984accdd394d5fc1d01595545c7ece0e4 | |
| parent | d86a2e157e9cefe73334498e4b11225233b6a2c4 [diff] | |
| parent | 52ad2b4bf2927733a4363d4858bee3bc9f537e3a [diff] |
Merge "resolve merge conflicts of 76976c744d to lollipop-cts-dev" into lollipop-cts-dev