| commit | 3c10c7f02277585da94e68fb23823a22201899c7 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Mar 15 12:05:43 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 15 12:05:43 2011 -0700 |
| tree | ad3cf2304e44d77a583ac28ff560bf9310fffd1a | |
| parent | ef098e3f2c8820f6ff9bc230dd2382b2b560dbde [diff] | |
| parent | 56b53603d996385d5952c67fbf27a87e5201de69 [diff] |
am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge. * commit 'a82a219a7aaee82d790810f6660924604b7a7e81': Merge adaa12cd from honeycomb. do not merge.