| commit | 8773d51eae2a40d95adfe517476e9098eec14166 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Jan 28 19:47:58 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Tue Jan 28 19:47:58 2014 +0000 |
| tree | a41c2c1ffb088320a1169d286116bbc254c7f373 | |
| parent | be674bf688fec9ce4ec04e77c93644be8253d273 [diff] | |
| parent | b82b2f985143d2e799ec4a9557f1e50208589279 [diff] |
resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b