| commit | 9f7834106a5db5805112a34e0c6ebe6f1b7a1718 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Mon Jan 26 11:03:31 2015 -0800 |
| committer | Chad Brubaker <cbrubaker@google.com> | Mon Jan 26 11:03:31 2015 -0800 |
| tree | 3324ea627509cb816442d5ec981d3ed10262f9d6 | |
| parent | 5891f45815455ca6f7753d4e84f4460f1255a4af [diff] | |
| parent | 7793c3832a4d40d1bc9f396ef502b2ffd7bfdafb [diff] |
resolved conflicts for merge of 7793c383 to lmp-mr1-dev-plus-aosp Change-Id: Ic0238ae46efe2945eabc1e17cbcf9b1f71c4076f