| commit | 52ad2b4bf2927733a4363d4858bee3bc9f537e3a | [log] [tgz] |
|---|---|---|
| author | Agatha Man <agathaman@google.com> | Tue Feb 16 11:53:09 2016 -0800 |
| committer | Agatha Man <agathaman@google.com> | Tue Feb 16 11:53:09 2016 -0800 |
| tree | 67f73fb984accdd394d5fc1d01595545c7ece0e4 | |
| parent | d86a2e157e9cefe73334498e4b11225233b6a2c4 [diff] | |
| parent | 76976c744dcb6bb8d1b2fd1883da666f80c32a77 [diff] |
resolve merge conflicts of 76976c744d to lollipop-cts-dev Change-Id: Ic70556426f85127869ac4167c642558ad8738011