OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 01:51:20 +0000 (17:51 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 01:51:20 +0000 (17:51 -0800)
commit99f215d5f502cb3ba2d98bdf34cfe3520843d617
tree148d30e304749c0ee968aa9b4d2e4ca10cae90cf
parentc8054f4b8fb4c316bb4d57ef762fe4e72c0d2b5f
parent6fb212b55eb3c2819c7a4f530f6beb3586b0a07e
merge from tools_r9

Change-Id: I4de6cfe4ca47f134813fd44f617103f8ac43822c