OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Fri, 19 Aug 2011 23:44:59 +0000 (16:44 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Fri, 19 Aug 2011 23:44:59 +0000 (16:44 -0700)
commitd82ddb8354b5cc68dc077dba7c0ede60c06ca316
tree032878617884ded153c70a3f4077d6f077743b63
parent6d4dfbaea0f5f13f176c53f10c411126bc8e9db4
parent39f953c53d4388044afdac63629e260b0a1ddce5
merge from open-source master

Change-Id: Ib5266e2b1538057f5859ec61ee8f3c4531acfa32