| commit | 77123ca5529d2b7f27c665ea75df3463e813b0ca | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu May 19 12:48:14 2011 -0700 |
| committer | Kenny Root <kroot@google.com> | Thu May 19 12:48:14 2011 -0700 |
| tree | 384bd709bfdad1b99e928efef531b47d16a3d8f3 | |
| parent | 46be04f085ddd8b753f0fda49e3a82a9b749242e [diff] | |
| parent | e5c511391b2828f19ea8e7852d188e01d76399d6 [diff] |
resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1