| commit | 3c3a64616a7d37183ac008516afad4dd93b9f562 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 08 18:03:38 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Aug 08 18:03:38 2013 -0700 |
| tree | 032a162a2248b2fc0be232afc9b9666747a1e5dd | |
| parent | d41e52a238bdb91df5dffb81f202b3d50949bb9a [diff] | |
| parent | dce94165a5624935db9855e208420d36c763f771 [diff] |
resolved conflicts for merge of dce94165 to klp-dev-plus-aosp Change-Id: If5f34f4a31c6a1218751f472ac949c324117a948