OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Tue, 23 Aug 2011 18:20:49 +0000 (11:20 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Tue, 23 Aug 2011 18:20:49 +0000 (11:20 -0700)
commit288b8d687ee179c05ec848c66f5a8229a9247dd4
tree31e6d8507d646247b04e416354731daf324b7b83
parent530030f20557076fc9d1ebecbdd27c49243a3816
parent898e6c67abc04806ecb42a50c6e31112b11089af
merge from open-source master

Change-Id: Ide29dfe8d457e176fe758d3998d73703bf08122b