OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Sep 2010 03:21:28 +0000 (20:21 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Sep 2010 03:21:28 +0000 (20:21 -0700)
commit61275735d59674ddd863e44635b82324bb7c6a8a
treedb24ebd024c9e4ce05224c521eccab11b6bdf7e4
parentba584097e0b571b91f85c31b47745cacfc9c0e27
parentb7412598b955d6140d394bbb298529e4cdf8d913
merge from open-source master

Change-Id: I9be77e4dd63859b6679a87895f693c32128eea32