OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Thu, 4 Aug 2011 20:14:40 +0000 (13:14 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Thu, 4 Aug 2011 20:14:40 +0000 (13:14 -0700)
commitdc2634d37d187440628e377e2951d39974a62f57
tree370847e62612bdd0e0b4ae3d71331e7a41acf637
parentcbdd601f0e93b2486227e46d87ab6432e5cfc85c
parentb8104b4bb73c80b41179bcd603b26037deb84ac2
merge from open-source master

Change-Id: Ic8120ec9bcca6cb563d8da72ff8234ed446ecdda