OSDN Git Service

merge from tools_r7
authorJean-Baptiste Queru <jbq@google.com>
Thu, 23 Sep 2010 16:49:54 +0000 (09:49 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 23 Sep 2010 16:49:59 +0000 (09:49 -0700)
Change-Id: I15581b778be83b662b23994e53ff9c22ab796667


Trivial merge