OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 22 Mar 2010 22:55:50 +0000 (15:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 22 Mar 2010 22:55:50 +0000 (15:55 -0700)
Change-Id: Iff03217fcd4e889d96b428079eb2a6bb5b48d9dd


Trivial merge