| commit | 60f11be60f84e79f69e597d158a775c1294e75e9 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Mon Apr 29 12:11:33 2013 -0700 |
| committer | Eino-Ville Talvala <etalvala@google.com> | Mon Apr 29 12:11:33 2013 -0700 |
| tree | fefe2a668f1faef596c9b7ed6b89b02e134f16d3 | |
| parent | c86ef45279185b474bd6af0a7ae407f8ab577f13 [diff] | |
| parent | c853784db78a22866cb1e8fab392724f753d8a71 [diff] |
resolved conflicts for merge of c853784d to master Change-Id: I8aecc3c4c533a0444ee5c696f05b5c48ac077dbf