| commit | 400153fc8d1ae20a2fabec36e3144e7623f282d4 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue Dec 09 20:13:25 2014 +0900 |
| committer | Lorenzo Colitti <lorenzo@google.com> | Tue Dec 09 20:13:25 2014 +0900 |
| tree | aa3d0b82822c2fabef61de0b475a3c71932f117a | |
| parent | 418109eb96b485cdc009ba88deb9f60f9dca06d3 [diff] | |
| parent | 6b2007aacd13344c9bc73d5d858bd903b432c228 [diff] |
resolved conflicts for merge of 6b2007aa to lmp-mr1-dev-plus-aosp Change-Id: I215040ac1e5b37678d8828d48abeab7ca51726e8