OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Oct 2010 14:24:07 +0000 (07:24 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Oct 2010 14:24:07 +0000 (07:24 -0700)
Change-Id: I0eae9fb8cb9b11a74ecc765d318ab26cbe7f650b


Trivial merge