OSDN Git Service

am 216d8448: am 95f862bc: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 21:38:37 +0000 (14:38 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 May 2010 21:38:37 +0000 (14:38 -0700)
commitda9a8535b06200932aa7cb26697a9da24f7d688e
tree9253617bfd03b8a8115ead6dd2ed807612e1bf76
parentce88086cc425b33e0c389dc9a233e5a72acf6833
parent216d8448a04f3c7794d1e4ec1178a2bf6da2ba95
am 216d8448: am 95f862bc: merge from open-source master