| commit | 0d22608cf3cedc6e83b90b571b1042a0a714c983 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Nov 20 10:59:07 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Thu Nov 20 10:59:07 2014 +0000 |
| tree | 6f8947ebdda8f17da26076efd9b4341b1a7055e1 | |
| parent | 6973a63e967a8c913afa603b312ec9516f19d4fb [diff] | |
| parent | bcb86374dccf15a8ee1dc03a1c69638fc6d9529f [diff] |
resolved conflicts for merge of bcb86374 to lmp-mr1-dev-plus-aosp Change-Id: I68bd16ed55f9e3794049051184f82503f679667c