| commit | 471ea6a29f188f7018ae4ae647e914b384216863 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Nov 15 08:59:56 2013 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Fri Nov 15 08:59:56 2013 -0800 |
| tree | f65987f8917b1773720b011a958c3f61edbc3694 | |
| parent | 39a6c74dcb4c9db71be00cbda9110468d664d614 [diff] | |
| parent | e42d81bb5ad62f023666e4a2dac627e4d406592f [diff] |
resolved conflicts for merge of e42d81bb to klp-dev-plus-aosp Change-Id: I599e0e80f5a13722108f5f525b177fea28575a72