| commit | 9871afafd29015856be3da4920809e77e1a1321b | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Jul 23 11:58:02 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Wed Jul 23 11:58:02 2014 -0700 |
| tree | 8e0d4aac5f3f79f59f8e00c906a8c9dd31d36edf | |
| parent | 0ebe2f82849766ad0130bcc81ff906a1905b175e [diff] | |
| parent | 525f2f30851f5e809451fc01a7d0a8baac0abb2b [diff] |
resolved conflicts for merge of 525f2f30 to lmp-dev-plus-aosp Change-Id: I74f36b70583f4faf57befc9c6371ffd69e9a7cf8