| commit | 7162996734fbd2b3c0aaf63db842f2fc48bc95bb | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Oct 20 13:38:43 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Mon Oct 20 13:38:43 2014 -0700 |
| tree | 666b39be4820702bb20abb491391243745f7daf9 | |
| parent | 52b4d2f0964feea351e931a32a0671424dc00583 [diff] | |
| parent | 96c22133af53974a8e55412840338c2e29140298 [diff] |
resolved conflicts for merge of 96c22133 to lmp-mr1-dev-plus-aosp Change-Id: Ia94c5ad273c3578433d3eb226e8e8de7c1921d34