OSDN Git Service

am 9f78ffb2: am 615f8446: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:22:33 +0000 (14:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:22:33 +0000 (14:22 -0800)
commitb8547bf12c53107219d7de786c234f165055e754
tree11b734d5bb8e7327700939514a68fcfdff92c0e9
parent93fd30f9c7752d0336d3b26be68abe9f85678ce1
parent9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81
am 9f78ffb2: am 615f8446: reconcile main tree with open-source eclair

Merge commit '9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81'

* commit '9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81':
  android-2.1_r1 snapshot