OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Fri, 26 Aug 2011 19:07:40 +0000 (12:07 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Fri, 26 Aug 2011 19:07:40 +0000 (12:07 -0700)
Change-Id: Ibc17c1b227a6af2ce933040260d9b4a858eeca1d


Trivial merge