OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Mon, 8 Aug 2011 17:46:08 +0000 (10:46 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Mon, 8 Aug 2011 17:46:08 +0000 (10:46 -0700)
commit33f24e7b63625764837729377913754c44d1efd5
treec65b4ec59d9d45552ce14e8bacc63a473612aa02
parenta05741a5f8c9b83333cc5d6ea8101c4218a5c74c
parent7845d8aec9a5b09c4207a5dd3499e6339a9e952e
merge from open-source master

Change-Id: If0dab193ba393de8b8a8cc2007c2c9c36fa745b6