| commit | ca34bcf6746454c561b0c07ca5c6e42bd4a73e9e | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Thu Aug 16 12:22:23 2012 -0700 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Thu Aug 16 12:22:23 2012 -0700 |
| tree | 29438f2102ae8577323f3f7de09b3b03b62e4893 | |
| parent | 14250ccf22f88ce0a44b4fa1ec992da9344ffe18 [diff] | |
| parent | 80c904df159f5a19517ec0246c35d69e40534747 [diff] |
resolved conflicts for merge of 80c904df to jb-mr1-dev Change-Id: Ic2f8d64cd716d04a533ca0685d1fb0d5e2a21933