OSDN Git Service

merge from tools_r7
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 22 Jul 2010 18:57:07 +0000 (11:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 22 Jul 2010 18:57:07 +0000 (11:57 -0700)
commit59361df9d64caa6925575fc5b4db231eb00a5789
treeae814c5f80b495bf7c21548ec83d8ebf8d196257
parentd784a5000d432260f9efe0ce5f62177f38dba6be
parent775037a408d2cb38986d96c322579329bdeb974e
merge from tools_r7

Change-Id: Id00197ab55d948f7ef679a17c1d00a3c4e05dfc8