OSDN Git Service

merge from tools_r12
authorThe Android Open-Source Project <initial-contribution@android.com>
Wed, 15 Jun 2011 01:17:07 +0000 (18:17 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Wed, 15 Jun 2011 01:17:07 +0000 (18:17 -0700)
Change-Id: I51da72204b208742edac5cd6f5c3b708bba13346


Trivial merge