| commit | 048cf5c066f8430fd435696930d87a343283c4c3 | [log] [tgz] |
|---|---|---|
| author | Scott Kennedy <skennedy@google.com> | Thu Mar 14 13:11:56 2013 -0700 |
| committer | Scott Kennedy <skennedy@google.com> | Thu Mar 14 13:11:56 2013 -0700 |
| tree | c6576bf3c3238ae81bff6b3e519e90ad0b3ed86b | |
| parent | 821d2f8611ac304dffdc1af044d3170c80e09f0f [diff] | |
| parent | 06e232c1d91284a1c42f9e316164626e7c8f4c0f [diff] |
resolved conflicts for merge of 35d3af70 to jb-mr2-dev Change-Id: If85946ef3dbf82eb3a790adf320765e4a25d91dc
