OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 17 Jan 2011 03:14:21 +0000 (19:14 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 17 Jan 2011 03:14:21 +0000 (19:14 -0800)
commit09c1602c691cbf07806f3b28f11c4a1e3fee9445
treed7cd731dcdfe534eca14671ad1c3896dd8eb4f1b
parentbd24e4cd67503e526307466038795dece2d0ed36
parent1c464ae3a5c7b19e16d9987910b1173fd5bffa70
merge from tools_r9

Change-Id: I68c6498ffe1dbcd78bef71b85046501a25cf5231