OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 25 Oct 2010 21:20:18 +0000 (14:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 25 Oct 2010 21:20:18 +0000 (14:20 -0700)
Change-Id: I922e77a1fde90a6d73cc5f9afcf79f11343e18a2


Trivial merge