| commit | 80996bbf40ff192117c391074ed2f9b2cde4e69a | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Jul 24 16:38:58 2015 -0700 |
| committer | Adrian Roos <roosa@google.com> | Fri Jul 24 16:38:58 2015 -0700 |
| tree | da70268910fbd91e46e1c27d1bfa6e8bea9438c5 | |
| parent | 3e0c1c48047e2a23e2215866c8c7037f45052393 [diff] | |
| parent | d435253322aeec16e879852eaeaca27d25573d27 [diff] |
resolved conflicts for merge of d4352533 to master Change-Id: I2b9b39a76fdda1e470cba3634ed9986e658d9810