| commit | 8b8e5d45928aed8592d321fe55f560e35a4fece8 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jun 13 11:19:14 2014 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Fri Jun 13 11:19:14 2014 +0100 |
| tree | 4b3f3a52af3086587e3ac3cb741698b005c64fb1 | |
| parent | 2a8270e6944fb3addfcba87f6885aaad196b8b88 [diff] | |
| parent | cbd74fcbd2528e3cdb699ac26e8ed579085dd49a [diff] |
resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aosp Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033