| commit | e514d2fe6646b89d49037853cf4d6c4232110d18 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Oct 22 16:41:42 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Oct 22 16:41:42 2013 -0700 |
| tree | 39dcfa3666eb333e8a0ad65c20a5aadc8c28f9aa | |
| parent | 0775b1dae8b9927c67064734f48ae3dc25ed1f8a [diff] | |
| parent | 1dbf56aab570df49228304f65ce4588ff608912a [diff] |
resolved conflicts for merge of 1dbf56aa to klp-dev-plus-aosp Change-Id: Ia1d1467065320941d6dc3a50f7ea85eb4dbf3841