OSDN Git Service

Reconcile with jb-dev
authorJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:14:31 +0000 (15:14 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:14:50 +0000 (15:14 -0700)
Change-Id: I759af63dfafa66468b93dc7c4ef7db42d760c4d6


Trivial merge