| commit | 43e459a234df420806d30bd5613464eedc25ece7 | [log] [tgz] |
|---|---|---|
| author | Sreeram Ramachandran <sreeram@google.com> | Wed Dec 17 11:32:50 2014 -0800 |
| committer | Sreeram Ramachandran <sreeram@google.com> | Wed Dec 17 11:32:50 2014 -0800 |
| tree | d7a92a6fb2fc8398c42acb509875b3dff372d023 | |
| parent | 0f0a1ebdb167d31c0eef7d4a5ded3cc752c3d500 [diff] | |
| parent | 2008e147e5c58ac6f81bc2bac87fbc1313d5a38c [diff] |
resolved conflicts for merge of 2008e147 to lmp-mr1-dev-plus-aosp Change-Id: I9e7400c62fd9cb8eec946c77ab0727e05af18638