merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 29 Mar 2010 18:01:59 +0000 (11:01 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 29 Mar 2010 18:01:59 +0000 (11:01 -0700)
commit62ac0dc457bddf7472f7be1e9895b1aee20f35cf
treea64eeb5831341d6f51c2f64af2335fc3a8a0e600
parent7e0bfb511e85834d7c6cb9631206b62f82701d60
parent58f0326362ca0f5fc17cbc19fd9217cabf0d93dd
merge from open-source master

Change-Id: I96d2cd063f084fd17116bf7ee08fa7109a3c1ceb