OSDN Git Service

Merge CTS-related change
authorBrian Muramatsu <btmura@android.com>
Thu, 7 Oct 2010 19:51:33 +0000 (12:51 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 7 Oct 2010 20:44:47 +0000 (13:44 -0700)
Change-Id: I622b2647f075a8cefe82f0373e2f37b6ca7e6e4b


Trivial merge