OSDN Git Service

merge from tools-adt_r11
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 May 2011 21:21:58 +0000 (14:21 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 May 2011 21:21:58 +0000 (14:21 -0700)
commita8228554adf06d270cf9ac0ddb8f7e9718c6cf3d
tree957069c25eed70d67abb704fe2feb11e62c702b4
parentedbf9e524603a4c76885e291ddcb694fbde6f183
parent80d5c270c310b61373e07d6be90a200513299a7a
merge from tools-adt_r11

Change-Id: Iaf1edd6850ad25451d8d5aa54642cc0eb56184da