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)
commit848b415146882278b9275bd583da3ba5dc9a16c8
treeb5a5d9232c8c8d3b5b0e931700f539f76f131f4c
parent5f06af5ea8657c2b857f8fd5a9c7d97771772ac4
parent7fd07c3f0345d604f8ae1d579c0e48304c109f0b
merge from tools_r7

Change-Id: I15581b778be83b662b23994e53ff9c22ab796667