OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 12 Oct 2010 23:45:22 +0000 (16:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 12 Oct 2010 23:45:22 +0000 (16:45 -0700)
Change-Id: I60ad346ce0a86ed43259afad33981461fe53cc3b


Trivial merge