OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Jan 2011 00:45:54 +0000 (16:45 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Jan 2011 00:45:54 +0000 (16:45 -0800)
Change-Id: I3abf5d63d69c4609b6b45c689c1dfe66b278f8ef


Trivial merge