OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 21:42:33 +0000 (14:42 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 21:42:33 +0000 (14:42 -0700)
Change-Id: I8a67eacfb33430d61d738b588955148b2f11994c


Trivial merge