OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Jul 2010 20:58:43 +0000 (13:58 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Jul 2010 20:58:43 +0000 (13:58 -0700)
commit3923714fcbfb00ce125e451f937dc648e2db25fb
tree94ca8f2d5495a361be1e1994c3547059cc25c212
parent3fa4e58341f4fce1f6a563255d92fea5c5763fb5
parenta812513c65e2649f07eb63ec392c2cd4ee1ffc7b
merge from open-source master

Change-Id: I6bdeeff30be1fdb0901aec9bcdd67176c29eaf7b