OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 13 Sep 2010 19:26:54 +0000 (12:26 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 13 Sep 2010 19:26:54 +0000 (12:26 -0700)
commita3e1d34648677d25569027c47f68513c6adffe90
treecaaca1846a7dd0bc0bca85fd988878e1fac3e06e
parent98f286462fe20248f11c24031c1fa5ac19931db5
parentf925785d6911901547bcf4b6d7fc347c4fc6eef6
merge from open-source master

Change-Id: Iaeb49f269cb29e696c185e88ff4ae7c36c56b13d