OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Aug 2010 22:25:00 +0000 (15:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Aug 2010 22:25:00 +0000 (15:25 -0700)
Change-Id: I215cd89ec845a094137ace2e361aa76c5050e542


Trivial merge