OSDN Git Service

merge from tools-adt_r11
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 17 May 2011 18:05:24 +0000 (11:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 17 May 2011 18:05:24 +0000 (11:05 -0700)
Change-Id: Ibd616f054c3774c41e10b72e9995d5b0eab78d33


Trivial merge