| commit | 24b8947f62d9bdb91aae408894faa5fe59564e46 | [log] [tgz] |
|---|---|---|
| author | kmccormick <kmccormick@google.com> | Wed Mar 27 19:23:51 2013 -0700 |
| committer | kmccormick <kmccormick@google.com> | Wed Mar 27 19:23:51 2013 -0700 |
| tree | c12879ba22aa8ea092c6222f1879d61ba2463692 | |
| parent | 1946eb054970a7ae94eac1cdc6f7e50c1a710570 [diff] | |
| parent | 603f987f14d52111f8ee76eb2c6c593ec3d10918 [diff] |
resolved conflicts for merge of 603f987f to jb-mr2-dev Change-Id: I4a130dad9d4669799f5d477f67e0f9a6a04381ca