OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Jan 2011 00:22:50 +0000 (16:22 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Jan 2011 00:22:50 +0000 (16:22 -0800)
commit60687e75ada0c10eadd8507fd68d58937b0787c3
tree8c8d9a00aad13cc8cc02dc43a1ed3fd60156086e
parent06f22908f368233bb66366d73496d648f55b928a
parenta9378b553784782e24cbc64cbdbcbd75a243ee1a
merge from tools_r9

Change-Id: I2c7746cdb6b6df94186aebbc24240c5f457876d0