tree 5262411d344ae7c2bdcd08c1a504517d23a00484
parent 22f3a8490a46f905da28694195f0ab674343bc8b
parent b74155602a0d3b88f821f49be09c5db5724dabec
author Jean-Baptiste Queru <jbq@google.com> 1345048484 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1345048484 -0700

resolved conflicts for merge of b7415560 to jb-mr1-dev

Change-Id: I74a2c85a5d00e9e18a1b41753be92b1c4eef39c6