OSDN Git Service

merge from tools_r8
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Nov 2010 21:21:56 +0000 (13:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Nov 2010 21:21:56 +0000 (13:21 -0800)
commit9629274fd1b7e36134db92ecc86dcc8e2cd361ee
tree8f68457eb9a5a5fa92c56277759172a695b1eba5
parent7aa052149875bf58fe9ff3990e6e01140e983afe
parent99c2a00947a64ada8bfe0fb92dd57f4af5ecfde5
merge from tools_r8

Change-Id: I7eb330edd8f5fdb70b54ad61e773071a46131984