merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Jun 2010 18:33:00 +0000 (11:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Jun 2010 18:33:00 +0000 (11:33 -0700)
commite8f79c1f5de7ecaf1249ee36813abd2558cacf08
treecabeaa809a3156583c63b4d68329e5ae5cc2f91d
parent04ed4a1c888309dc3af3fbeb0a32eb91b3733f23
parentc6b5cd8d76bdcc046295721d117eae0529aecfc1
merge from open-source master

Change-Id: I408b5705b18d9e93e66bfbfeec0e3baefd618dec