| commit | 5369b76963a344d08fda4532227a6f0da28fd23a | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Wed Dec 10 15:23:54 2014 -0800 |
| committer | Chris Craik <ccraik@google.com> | Wed Dec 10 15:23:54 2014 -0800 |
| tree | 9cc8519749be8ddff2f0f1d4c4fe7a1457c80fcd | |
| parent | 16d73a752e9ee937c39be4ce2da5411cf1af0c5c [diff] | |
| parent | ed211b940b24231d02c4e6e2757ee02ff1b9ea79 [diff] |
resolve merge conflicts of ed211b9 to lmp-mr1-dev-plus-aosp. Change-Id: Ib9d6d301282bbaae6b23b9ce07b9e6a4e9075991