| commit | bdef5499d4eb0c4f5e6853471373acd610798c7c | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Fri Mar 21 16:57:22 2014 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Fri Mar 21 16:57:22 2014 -0700 |
| tree | a39ad7cc08bb5d753b1b9ce4b1d14e7ce2dbd7e1 | |
| parent | abf0853702e8604eb2063c56ada27232d7a3e67d [diff] | |
| parent | f8f0531bb69a90e87f1bafa875e665e3935610b1 [diff] |
resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aosp Change-Id: I87228aa0dbd0b909437c85812f2404ca8be39f38