OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 02:37:45 +0000 (18:37 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 02:37:45 +0000 (18:37 -0800)
Change-Id: I139efed2817d3a2d0d80fc2c6e45b9a793c15992


Trivial merge