OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Sep 2010 23:27:14 +0000 (16:27 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Sep 2010 23:27:14 +0000 (16:27 -0700)
Change-Id: I3941348e7467354f462ce2980a51caf560245342


Trivial merge