OSDN Git Service

merge from tools_r8
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Oct 2010 20:12:44 +0000 (13:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Oct 2010 20:12:44 +0000 (13:12 -0700)
commit298157b79a5f8c7b62891f8fb9848e6111d3b3e1
treebaad0f581e41250931bb35095cb6ebd2ed1d1ae5
parent978980f79f6fb8cd5a08dfdaf6426cc7b2531c28
parentdea7f784656b0d3af46cdcb0c5d514aa25b400c0
merge from tools_r8

Change-Id: I50e3e6ada3a357bd519d5ccd7465ca236a525b84