OSDN Git Service

merge from tools_r7
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Sep 2010 00:34:21 +0000 (17:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Sep 2010 00:34:21 +0000 (17:34 -0700)
commitef993b5ec75d724db1744aef2363e0f00313f674
tree23ff664b3f34ec39fae2076db2e8b3f443a86a80
parentb095d19e75250fe02f49a32b556446e4ccc45a67
parent1fc95cae8ec2ccfe134ff279ed9082311ad0d877
merge from tools_r7

Change-Id: I9de1ce4221adea247a5f6afe958e2a2e67332034