| commit | 25d729c3aba847cb4b56b1e6ca143410faca76c8 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Jun 28 09:47:36 2013 -0700 |
| committer | Eino-Ville Talvala <etalvala@google.com> | Fri Jun 28 09:47:41 2013 -0700 |
| tree | 7f65dbe0d8b496541782f55b8682fdb01a03c08a | |
| parent | 7919fa2c33b1fa7f5e49b2188d671bfe519c231e [diff] | |
| parent | 364a2677c862af64f21b41dd3ab1b9e5c68b4ce0 [diff] |
resolved conflicts for merge of 364a2677 to master Change-Id: I21f23c1c5e4408c24c359bef6270dffce47a988d