OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 17 Jan 2011 03:02:47 +0000 (19:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 17 Jan 2011 03:02:47 +0000 (19:02 -0800)
commitbd24e4cd67503e526307466038795dece2d0ed36
treed895f8ad6a8ed4c4847d85b3bed56cb3aa616d22
parent1f4398a6b00f5668551c03244cc7eeea5ac5deb7
parent76fffa31fc14457227e701c00cf7181b0213a912
merge from tools_r9

Change-Id: I4d3eacaf4725230988c2fbfedad19008401bba05