| commit | af19e09b02c676e9cda2fae6398e34150fd3567d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Oct 07 15:10:00 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Oct 07 15:10:00 2013 -0700 |
| tree | 4dc6bb91e3adc604be6b0d14f662a7336d78c6d7 | |
| parent | 46a091f5f15b8a5bfae678e324a98443f6c8340f [diff] | |
| parent | e1fe52ccf12f8cabff1b0c74ff137e736876bd7a [diff] |
resolved conflicts for merge of e1fe52cc to klp-dev-plus-aosp Change-Id: Id3f3176a842fb4bb45f4f48773e6e27ea7d8769f