OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Aug 2010 22:13:00 +0000 (15:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Aug 2010 22:13:00 +0000 (15:13 -0700)
commit32b91a43988aded74942040418744cf6beea7bb1
tree563b3fbc859b4d8dad91354bfb95f0bd671faeba
parent968e2cdf1e8be272d6905370bcf7e30b8cb4e184
parent0e32c500b375fb2191e94f230522469294eb4066
merge from open-source master

Change-Id: Ia55cfd4c49a26447d06124b4505eeff73e5998e1