| commit | e4e91c4ead821afb5aced2e33ee39d8878eb4d1e | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Sep 20 12:45:20 2013 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Fri Sep 20 12:45:20 2013 -0700 |
| tree | eae0a2a49a2406b988e054b275cab90e5ea0d05a | |
| parent | 754bad4534e9a2de8b4e3ecbe097993c71246f91 [diff] | |
| parent | e678897f3a3bdafe45f939bb12ca454365374e49 [diff] |
resolved conflicts for merge of e678897f to klp-dev-plus-aosp Change-Id: Ie2a5e7a917ab7f5a0ee98300b880d22c7a10bf70