commit | eb2cd90c001fd53356d01030584066592f5a7bae | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@android.com> | Thu Jun 02 18:53:03 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 02 18:53:03 2011 -0700 |
tree | f131f449d1316816f9fb2411882e310e1c6f955d | |
parent | 63c7259ee0d31c0fb822107f50531919c6d3ebdc [diff] | |
parent | dc35d6e36679f11a11ffb70416d0b0fd04303ad8 [diff] |
am 311f9493: (-s ours) am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge. * commit '311f9493dfa88d455ff0ea25f86e508a6852682d': Merge 2402ad60 from honeycomb-mr1. do not merge.