| commit | 73741561d6d476dd24542b6b29e7dd972ee92278 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Mar 15 12:07:41 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 15 12:07:41 2011 -0700 |
| tree | 0b5d35ae7bacd0837b7d778ce90367bed325b021 | |
| parent | 5e32eb1b55bf8433e7ca0cef3797d52ffdce9c1b [diff] | |
| parent | 3c10c7f02277585da94e68fb23823a22201899c7 [diff] |
am 20ad9553: (-s ours) am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge. * commit '20ad95532476bad17bbef8d406814b06f3d7fcf1': Merge adaa12cd from honeycomb. do not merge.