merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Mar 2010 21:24:25 +0000 (14:24 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Mar 2010 21:24:25 +0000 (14:24 -0700)
commit1d168621a524e3937cd4e2a1cdec18a230b89a35
tree313c8fd8c40432a78b6b99bc4c66175e56be4fef
parentd04672513351af4eb302692e0f39fd5bd17191cb
parentacdb052030d6e537e51d8b42e07b2a9e71e6ee42
merge from open-source master

Change-Id: I950e9aca87cbb0c35099b1d53cff6378bd0f26f4