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)
commitc5d06301abe18c3fd709b9b37ad64b8d26ad273c
tree9bfe7e4df3ec1b215ac309fc73897d85d360d701
parent9aff3c7d58e7ee737033a4da23d5c590e36ed78e
parent36a38df99cd7485db6a83c4f8c7b329c24b9b6e8
merge from open-source master

Change-Id: I8a67eacfb33430d61d738b588955148b2f11994c