OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 21 Aug 2010 18:27:20 +0000 (11:27 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 21 Aug 2010 18:27:20 +0000 (11:27 -0700)
Change-Id: I9d22b5e33b228b6b54234387356bc592bfb51bb8


Trivial merge