OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Nov 2010 22:41:00 +0000 (14:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Nov 2010 22:41:00 +0000 (14:41 -0800)
Change-Id: I4d2189f435ea2ef7e66f4c78d703329eed1940bf


Trivial merge