| commit | 1bb3489e600876979146a6222ac5bb2a684702bf | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Feb 26 14:02:02 2014 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Wed Feb 26 14:02:02 2014 -0800 |
| tree | d1699d012c78861e4ca3cc55a262dd13e534a8aa | |
| parent | 785fff484474114e3b4f9ade6f1ad555eec10198 [diff] | |
| parent | e9c8fb900a460699201208870ce9997a734261cc [diff] |
resolved conflicts for merge of e9c8fb90 to klp-modular-dev-plus-aosp Change-Id: I9ee9908a915258937b343de90dce5774d914f03a