| commit | 92996481569eba52109f567d1cf032135496088c | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Jun 02 18:53:17 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 02 18:53:17 2011 -0700 |
| tree | f131f449d1316816f9fb2411882e310e1c6f955d | |
| parent | eb2cd90c001fd53356d01030584066592f5a7bae [diff] | |
| parent | 81434ee171bb9989a0565082fc41a301a285b2f8 [diff] |
am 59e699f1: (-s ours) am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge. * commit '59e699f13db9a32f30108e25577685bb39b3dae4': Merge 6103e22c from honeycomb-mr1. do not merge.