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)
commit91afae6c039d06df83d708834c96d47858406e2a
tree199789c202d963438d19e43340c269baa9065927
parentbaa97012143a8601aff04428a179446d8182a4a4
parentdd14acc3f665e83ee5da1cd300606c14a5513ae8
resolved conflicts for merge of dd14acc3 to jb-mr1-dev

Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f