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)
Change-Id: Iaeb49f269cb29e696c185e88ff4ae7c36c56b13d


Trivial merge