OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Sep 2010 19:58:27 +0000 (12:58 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Sep 2010 19:58:27 +0000 (12:58 -0700)
Change-Id: I4456cbab0228986b0c8d3396ebf8ee59dff65229


Trivial merge