| commit | f9fa770f389c0c710bf16fc38f52f6f36ad73793 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu May 19 12:48:41 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 19 12:48:41 2011 -0700 |
| tree | 384bd709bfdad1b99e928efef531b47d16a3d8f3 | |
| parent | 2a88c9e89105f9a4daf3cef752c2b390db66694e [diff] | |
| parent | 77123ca5529d2b7f27c665ea75df3463e813b0ca [diff] |
Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into honeycomb-plus-aosp