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)
Change-Id: I408b5705b18d9e93e66bfbfeec0e3baefd618dec


Trivial merge