OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Sat, 20 Aug 2011 01:01:51 +0000 (18:01 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Sat, 20 Aug 2011 01:01:51 +0000 (18:01 -0700)
commit0810a7e15453bbe9976287efcf74bd43ceadfa0a
tree95ba4d68c2d3fdda1d04f2b702fd8e72c2a056b2
parent5cdc105241b5e83ab08ef32172c0753d3d4eacd9
parent922e0f13aa83e84727076c48db39df6dde54c951
merge from open-source master

Change-Id: Ie211077d3db24be46ea19af95eccce8d8669e829