| commit | b4a601467cf0aecbcb25ed166d9a432783252216 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Tue Nov 05 13:37:22 2013 -0800 |
| committer | Dirk Dougherty <ddougherty@google.com> | Tue Nov 05 13:37:22 2013 -0800 |
| tree | 8937491a789ef1442cd52ce0dca4f0267b464053 | |
| parent | 18dbb0a52a3f48536b9444228e8b45763ec66632 [diff] | |
| parent | d7f2d1ca07b92cf333955f19e839f0b3dc30f9ff [diff] |
resolved conflicts for merge of d7f2d1ca to klp-dev-plus-aosp Change-Id: I390a8a3fefa182cc5bed8f356a8a3d1bec50278d