OSDN Git Service

Reconcile with jb-dev - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:25:25 +0000 (15:25 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:25:28 +0000 (15:25 -0700)
Change-Id: Ie7428c559f53a12d88e9afdbd7234423881aed0f


Trivial merge