OSDN Git Service

Merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 17 Sep 2012 18:14:08 +0000 (11:14 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 17 Sep 2012 18:14:10 +0000 (11:14 -0700)
Change-Id: I1582b595c49de5f235cd7f92eb66dad2bbff81be


Trivial merge