OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 13 Sep 2010 18:08:11 +0000 (11:08 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 13 Sep 2010 18:08:11 +0000 (11:08 -0700)
commit1a7049afbd131c93edc1af5caf835d689054c3ea
tree0cbe8c3f2892dc247140d85fc8bca5cafbec46f6
parente5b3ad0151c34de658c24d8e8876eff794d289eb
parentf681a76db5e794eee1bd1c0db809f4aa4ad2bda1
merge from open-source master

Change-Id: If7bfde22466609563307d2c9c46022528b009d6c