merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 18:01:49 +0000 (11:01 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 18:01:49 +0000 (11:01 -0700)
commit15956f92880d9e08a4eb9aeee528b990a0487fbe
treea630b9fac92e8091d8f3cd8d50b09e325195116c
parent7b6e6fa57240466c2728d553be136f800600dd71
parent16c91eff09e13ab62cea4ef5044518264483faeb
merge from open-source master

Change-Id: I1cc2f1123a296b05c4faaa419374376395e05936