OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 05:19:03 +0000 (21:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 05:19:03 +0000 (21:19 -0800)
Change-Id: Iad6814c88502ae6cc5a569b930a0030b9e1904f6


Trivial merge