| commit | 49c9a53d098091791b0e6e2d97ce6bf0d562d17e | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Tue Feb 10 15:57:08 2015 -0800 |
| committer | Lajos Molnar <lajos@google.com> | Tue Feb 10 15:57:08 2015 -0800 |
| tree | 54d465b8b2e933cda923baa0d7e8e1e857b67878 | |
| parent | c9f122d8f32ba6928ac9087448025fa3bed1553d [diff] | |
| parent | 157defdde7013062bbd04f7e873b6856adce14ca [diff] |
resolved conflicts for merge of 157defdd to master Change-Id: I14fd8063fa052f16868b8053a211190092131317