| commit | d5ba9c22236346578ce34e3e8b475b8cad9773dd | [log] [tgz] |
|---|---|---|
| author | repo sync <fredq@google.com> | Wed Mar 23 13:46:32 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 23 13:46:32 2011 -0700 |
| tree | 48649855a845e61dfe2fcdf36215928d3c4eaee3 | |
| parent | bfc10795f21383b6d48aff3476ceeb79cdfce194 [diff] | |
| parent | 9ab66ff42f3a03182b18dacaf64edc38fae103cd [diff] |
Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp