OSDN Git Service

am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge.
authorXavier Ducrohet <xav@android.com>
Tue, 15 Mar 2011 19:05:43 +0000 (12:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Mar 2011 19:05:43 +0000 (12:05 -0700)
commit20ad95532476bad17bbef8d406814b06f3d7fcf1
treec5b225b259b07a14187c812f346d38967b683ad2
parentaaae0573bb537b9de89c0410b9386e8f96c3568b
parenta82a219a7aaee82d790810f6660924604b7a7e81
am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge.

* commit 'a82a219a7aaee82d790810f6660924604b7a7e81':
  Merge adaa12cd from honeycomb. do not merge.