commit | 20ad95532476bad17bbef8d406814b06f3d7fcf1 | [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 | c5b225b259b07a14187c812f346d38967b683ad2 | |
parent | aaae0573bb537b9de89c0410b9386e8f96c3568b [diff] | |
parent | a82a219a7aaee82d790810f6660924604b7a7e81 [diff] |
am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge. * commit 'a82a219a7aaee82d790810f6660924604b7a7e81': Merge adaa12cd from honeycomb. do not merge.