OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Mon, 1 Aug 2011 23:29:15 +0000 (16:29 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Mon, 1 Aug 2011 23:29:15 +0000 (16:29 -0700)
Change-Id: I11f2b91a09037d224b65ade5302b42f18ed9ea6d


Trivial merge