OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Sep 2010 23:51:00 +0000 (16:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Sep 2010 23:51:00 +0000 (16:51 -0700)
commit599cf4951495ff71b56965e70900438d563df8ed
tree71d6ff3ee6dc991407d68be523b5c3a67cf1d7d2
parentdc9952c11082fca4e8cbf4f7995f5eaff75472ef
parent89d4a48e5fbedf1fc404dd00a3e68b5cade1309a
merge from open-source master

Change-Id: I326ef83cd0c38c1f790e0efb0db27ed42c4d8d27