OSDN Git Service

merge from tools_r10
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Feb 2011 01:01:03 +0000 (17:01 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Feb 2011 01:01:03 +0000 (17:01 -0800)
Change-Id: I8852a3ca28977057efff4aa50f31f99d5bf5b67c


Trivial merge