| commit | 2b6c9f5506aaa53cf7003585077a9b9b57bd685b | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon May 12 10:33:07 2014 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Mon May 12 10:33:07 2014 +0100 |
| tree | 9a66fba8929f8c89e8809a3c8234fb0f40d069f3 | |
| parent | 7da043857a3fd73aa06256b6a6199fc8f42baffa [diff] | |
| parent | e111e5a4325c29d18c709601ffa95bf6163fda89 [diff] |
resolved conflicts for merge of e111e5a4 to klp-modular-dev-plus-aosp Change-Id: Iaf9c22378a35a0bd2d9e20c6afeb208c468234ab