OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Tue, 2 Aug 2011 20:08:57 +0000 (13:08 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Tue, 2 Aug 2011 20:08:57 +0000 (13:08 -0700)
Change-Id: Iad708bec6e3d604922c8fa8ea629af1e7fa42df9


Trivial merge