OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Nov 2010 18:45:58 +0000 (10:45 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Nov 2010 18:45:58 +0000 (10:45 -0800)
Change-Id: I7f45f71c41479346fe109b0a71ee1f7549d3ceda


Trivial merge