OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 21 Aug 2010 00:11:05 +0000 (17:11 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 21 Aug 2010 00:11:05 +0000 (17:11 -0700)
commit80df896ebd69e500f5664f9e4baab0efcebeacdf
tree901ac362cb09054770d1bb29f48f35fd6141cd59
parent57d38bbef42500d3a324f77edd4c18017d1e44f3
parent4d34e2993992a1a52a77419e8802c0e644b7a664
merge from open-source master

Change-Id: I3c7e9f4b3b1af8b39d1d0e3dba1ad3fc6d9033c0