OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Aug 2010 19:53:17 +0000 (12:53 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Aug 2010 19:53:17 +0000 (12:53 -0700)
commit1fd72eac498ea552011b55afc9439c1cafe2e0f1
treeca403757e9bd3fe04e105b70858c1826ad05778d
parent3dfc79670a801df56dc9dab461b02f5478a315bc
parent2d382e2cdd4494f3781eeb41a0e91a3619aa7aea
merge from open-source master

Change-Id: I01a81355942ab0a11c257fd4ffa11b6db2e71e8e