OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Thu, 18 Aug 2011 23:03:01 +0000 (16:03 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Thu, 18 Aug 2011 23:03:01 +0000 (16:03 -0700)
commitc8aa6c649d93a7ef8f6028d266134383d53473e0
tree9cdc93f259e966e219d23260c6ab17398646b7e8
parent490b6a6ce991fe04d04c83c27d711fcff9321eb8
parentaf9354e2ab26ed0119deccae22fb23e2eef1daef
merge from open-source master

Change-Id: I929f43afc75c509dbcdd862c31306005d5228972