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)
commit353a9c7af371cf2d646eb063de6f738fca9ae2f7
tree6806676b003aa2ff3fcf5baf6a0d05f634e044d5
parent99f215d5f502cb3ba2d98bdf34cfe3520843d617
parent51acc325285233d9edad286b1ed461735f8aa546
merge from tools_r9

Change-Id: I139efed2817d3a2d0d80fc2c6e45b9a793c15992