| commit | 93e12a7c25b778d16124df83de40b6b0a8129d07 | [log] [tgz] |
|---|---|---|
| author | Svetoslav <svetoslavganov@google.com> | Thu Oct 10 19:17:27 2013 -0700 |
| committer | Svetoslav <svetoslavganov@google.com> | Thu Oct 10 19:17:27 2013 -0700 |
| tree | 4e95e7182204ff708836b9db4c7d5db2f1970a5d | |
| parent | 5cfd2b045956ae5eec3f886ca5f5b0db2de6e836 [diff] | |
| parent | 92aa5f4ed21f2baa2d48a3d8aa249d6e856d0777 [diff] |
resolved conflicts for merge of 92aa5f4e to klp-dev-plus-aosp Change-Id: Ib2a3bd688256cb2e6bed13ebac01a31bd2601788