OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Sep 2010 01:12:53 +0000 (18:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Sep 2010 01:12:53 +0000 (18:12 -0700)
Change-Id: I46c62c2477e6c89c4a8ab325301ff165bdce3d31


Trivial merge