| commit | 33e86c7a9143f89ae932034bbfe4c3a9f71114fd | [log] [tgz] |
|---|---|---|
| author | Derek Sollenberger <djsollen@google.com> | Fri Jul 29 14:16:18 2011 -0400 |
| committer | Derek Sollenberger <djsollen@google.com> | Fri Jul 29 14:16:18 2011 -0400 |
| tree | 42326f0f3d84236a13917882c8d0ee48074faa8c | |
| parent | 67020c06fcfe2c8d905008412afffbd6f259cdf6 [diff] | |
| parent | bbfbd30383bb8410604f257512a206c2d672776b [diff] |
resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6