| commit | 2aab7d3d9e10a1242fb5faa2851de721ba1d18c2 | [log] [tgz] |
|---|---|---|
| author | Agatha Man <agathaman@google.com> | Tue Feb 16 13:15:14 2016 -0800 |
| committer | Agatha Man <agathaman@google.com> | Tue Feb 16 13:15:14 2016 -0800 |
| tree | f240b3b67c913d678e503f0c6981540a40e0d874 | |
| parent | 2520f1571ee277aadca3b728597a7bb4f2edc0f7 [diff] | |
| parent | 531d76e04d96f63ebb99281bda2f7e793fbd08d3 [diff] |
resolve merge conflicts of 531d76e04d to lollipop-mr1-cts-dev Change-Id: I7e7da586887cef47dbecdfa62b3d49d3c88568b8