OSDN Git Service

Reconcile with mr1.1-release
authorJean-Baptiste Queru <jbq@google.com>
Wed, 17 Apr 2013 21:17:15 +0000 (14:17 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 17 Apr 2013 21:20:24 +0000 (14:20 -0700)
Change-Id: I61e5c59ba2ba1e1072440cc46202a88d3f89c1f7


Trivial merge