OSDN Git Service

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


Trivial merge