| commit | f96b93e22c65b03ab9c86741b5f1d5708329fac9 | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Tue Oct 15 11:49:09 2013 +0100 |
| committer | Torne (Richard Coles) <torne@google.com> | Tue Oct 15 11:49:09 2013 +0100 |
| tree | 375fad604043585afd69f104eed1e7b9a40e2ec9 | |
| parent | db931a3b2b70ae6db245880cda7e8d007487289f [diff] | |
| parent | c5f742d4de5fc29eac657647a8e6d901104a3933 [diff] |
Resolved conflicts for merge of c5f742d4 to klp-dev-plus-aosp Change-Id: Ieeb9460a66ca761ae347fecff671ce54dfbc9cdf