OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jan 2011 22:26:05 +0000 (14:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jan 2011 22:26:05 +0000 (14:26 -0800)
Change-Id: I51577e76c8c679f0c5f631411c71ea062acf22f6


Trivial merge