| commit | 22d074643ed0d010ebfdb0fca685d65eb2632e58 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Mar 27 12:50:58 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Thu Mar 27 12:50:58 2014 +0000 |
| tree | 46ed3de2ff7e9e33f5d5cc0861fa4e052fdc58e7 | |
| parent | 68d43e275efae8f7b83388ea6fdebbcf5cd1504f [diff] | |
| parent | eaab4df0ddadf313ab6b3c832896003968525091 [diff] |
resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp Change-Id: I871431e5a3ce45a33563ced845e044d37471689b