| commit | 56ca82191231f3aba1132e3db06e7e09a10ec6dc | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Apr 18 15:56:46 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Apr 18 15:56:46 2014 -0700 |
| tree | bc1fb58074d536961b71686fec951fb28595fdd6 | |
| parent | 235fd3c9effc63643db356a593e7f77f220a5f4c [diff] | |
| parent | ec42199a71c8309a431c22ee152806736c862c4b [diff] |
resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp Change-Id: I9ecd5d51be4d073ab93dbb0bd60097735e76bf94