| commit | 7912c457f032513d7a3feaf62ddacfa62ebe253e | [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 | 305f964a9c8f82baa3a48beffb254d4881db817c | |
| parent | 29d5873931361e85e86f42cb465b055198ae86b4 [diff] | |
| parent | 20ad95532476bad17bbef8d406814b06f3d7fcf1 [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.