OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Thu, 4 Aug 2011 23:41:16 +0000 (16:41 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Thu, 4 Aug 2011 23:41:16 +0000 (16:41 -0700)
Change-Id: I6cdc76392b676ce5a9162c6dc91ea7140a4cffca


Trivial merge