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


Trivial merge