| commit | b241cda1eec2fbefd6d21e0819532f7a76947635 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Mar 11 23:47:55 2013 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Mon Mar 11 23:50:26 2013 -0700 |
| tree | 661694b626732458ea8f97b7fb13e2a4c3cdecca | |
| parent | 03b8386de26ba6500af2d66687bff9b01f2cbbd7 [diff] |
resolved conflicts for merge of c508483d to jb-mr2-dev Change-Id: I7f32e6dd98c3cc61030cded700587aa852c0fc0a