OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 01:39:49 +0000 (17:39 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 01:39:49 +0000 (17:39 -0800)
commitc8054f4b8fb4c316bb4d57ef762fe4e72c0d2b5f
tree148d30e304749c0ee968aa9b4d2e4ca10cae90cf
parent2f28c84a511cc855a1b775feec0c1c199b3ea430
parentf4df12efd1906b947b32e92489b241ac19fab2e6
merge from tools_r9

Change-Id: Ibeeec73aa0f97959c41f8d0ad3ed03afc5bcaee1