| commit | 2d8d9ce072842c1c67e912686fd20795c43f221d | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri Feb 01 22:44:03 2013 -0800 |
| committer | Brian Carlstrom <bdc@google.com> | Fri Feb 01 22:44:03 2013 -0800 |
| tree | 6dadcd3e3e10fcce1625f200aed8e8e19e27a219 | |
| parent | b8bddcfe1c0fdb5fd26a0285673f7d4d488dbab7 [diff] | |
| parent | e0c8f22188026985f304bc28da6fb41d3bffb517 [diff] |
resolved conflicts for merge of e0c8f221 to jb-mr1-dev-plus-aosp Change-Id: I9988ca591a8632df0f67008a79942c8a8e4174ba