OSDN Git Service

merge from tools_r12
authorThe Android Open-Source Project <initial-contribution@android.com>
Thu, 16 Jun 2011 18:14:09 +0000 (11:14 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Thu, 16 Jun 2011 18:14:09 +0000 (11:14 -0700)
commit5773adb742c8915f9f72b47ab8f00ed4f79357ae
tree34367c134c317f736add21875237c5f17e70e0c7
parent32f13e95177973538cb87cd0a005ac69cae9fc54
parent061a8035bcad183d729b59d137e1fd0cc169c677
merge from tools_r12

Change-Id: Ic2a9844fe74da7c873c7264e38d50d568f190530