tree 661694b626732458ea8f97b7fb13e2a4c3cdecca
parent 03b8386de26ba6500af2d66687bff9b01f2cbbd7
author Brian Carlstrom <bdc@google.com> 1363070875 -0700
committer Brian Carlstrom <bdc@google.com> 1363071026 -0700

resolved conflicts for merge of c508483d to jb-mr2-dev

Change-Id: I7f32e6dd98c3cc61030cded700587aa852c0fc0a