| commit | 8af7e8ed3ecdfdf06d251c37c0cedfe340ffe18a | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Apr 09 10:03:41 2014 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Wed Apr 09 10:03:41 2014 +0100 |
| tree | f48c6bdbd2aa5e4e222ed11ad8c8ba54b93d494b | |
| parent | 049808e3263bb347e6a1eced99b348f98174c636 [diff] | |
| parent | 1852237a1bb4483e16d8991e1b6118cacb5afcbe [diff] |
resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aosp Change-Id: I09a8a4e95fc956392a0c61f38bd12332149a8d96