OSDN Git Service

resolved conflicts for merge of dd14acc3 to jb-mr1-dev
authorJean-Baptiste Queru <jbq@google.com>
Fri, 10 Aug 2012 19:42:18 +0000 (12:42 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 10 Aug 2012 19:42:18 +0000 (12:42 -0700)
Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f


Trivial merge