| commit | dfd1aa4331b8ab452d7baf4fdf8cf0cd36c67ddd | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jan 31 12:57:24 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Fri Jan 31 12:57:24 2014 +0000 |
| tree | 45dfe497ada812655fd55230dc7c8f65abfdc868 | |
| parent | 5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72 [diff] | |
| parent | 2cd0563cb8345747d3705d4f339a0800998767fe [diff] |
resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp Change-Id: Ia28df1c1aa084959ed9289bfe90e7f6a4bffb8a2