OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:02:30 +0000 (11:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:02:30 +0000 (11:02 -0700)
commit0d4dc714f9cb1b7f4df21e16892276b10d862635
treea5fa8cfd1bc6d8fe08ae07ab2353bef6255bf0e5
parentea1647aff1e5a2b132673fbbba0a1e443b22f9d3
parenta2e2d20256923094d8f511d02ff09b655916fecf
merge from open-source master

Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e