| commit | 16560f1e146c854bb006e22601dbcf6eac798167 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Nov 05 15:28:56 2013 -0800 |
| committer | Scott Main <smain@google.com> | Tue Nov 05 15:28:56 2013 -0800 |
| tree | 60bfd7a2007a3456224711c86694c61dbbd4ca39 | |
| parent | b4a601467cf0aecbcb25ed166d9a432783252216 [diff] | |
| parent | fae59e8ae129ec41faed029cfa09df8856b7d21c [diff] |
resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp Change-Id: Iaf15aa6c9087eb0e72661b40acbf74830df0b00c