| commit | c1375f6991a79781899fda3c3f9d471654562d3d | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jan 31 12:23:28 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Fri Jan 31 12:29:50 2014 +0000 |
| tree | 565dfac6b18d7398615b0844a7adb060b5649802 | |
| parent | 6a7699d5c62d1696305f8debf4c0f90a34ad6009 [diff] | |
| parent | 084209e27848eb91e0174e3583eafef3561aac24 [diff] |
resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp Change-Id: Ibf80470cfcaf553335d07c6fb220f7e9ec81ed87