| commit | 66c9c3b369d1a354945381876f6b55b375f9355c | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Mon May 12 18:55:21 2014 +0100 |
| committer | Neil Fuller <nfuller@google.com> | Mon May 12 18:55:21 2014 +0100 |
| tree | 7c44e4eb4f45ba4dde9ab4eb072f3cae6a701f37 | |
| parent | 93b28739a602839a92b6332839cacac6d7151b31 [diff] | |
| parent | 55434452be8ccb2063a3767cacdf76ec3fc165cd [diff] |
resolved conflicts for merge of 55434452 to klp-modular-dev-plus-aosp Change-Id: I6446ad90048100e6f87c2fe2203d98af85a31a44