OSDN Git Service

am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.
authorXavier Ducrohet <xav@android.com>
Sun, 29 May 2011 15:59:57 +0000 (08:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 29 May 2011 15:59:57 +0000 (08:59 -0700)
commitdc35d6e36679f11a11ffb70416d0b0fd04303ad8
tree29672e361f7c6f3e6cc4db311b837f040101a649
parenteac92714af2c67895938c73c91583d7b2354d1f8
parented0e037b04f862070cda10a578e9edffc198d992
am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.

* commit 'af83d4ecff0ad1638a1a0f3a3f9805468ed710b4':
  Merge 2402ad60 from honeycomb-mr1. do not merge.