OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Nov 2010 15:27:36 +0000 (07:27 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Nov 2010 15:27:36 +0000 (07:27 -0800)
Change-Id: I1603a3ab68a5f0eca583a835d3db730bf3d14649


Trivial merge