| commit | a981e3b01ae6af2b67e582f0d1cbb95560d05626 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Apr 09 14:57:59 2014 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Wed Apr 09 14:57:59 2014 +0100 |
| tree | d1a142bec93f77a95bda3322c16abe2ac4f53fef | |
| parent | 33ea32fd4e5edd7920adecd17ca69defd0c4ba93 [diff] | |
| parent | 7289f3ab8f05db6206d696d75f460fadc05dc731 [diff] |
resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp Change-Id: I788ca17503e2fd225e205a76d3e7062f71d58316