| commit | 2d21220f4ad163673392c7c253befae9adfcc3ae | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Fri Nov 14 10:42:25 2014 -0800 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Fri Nov 14 10:42:25 2014 -0800 |
| tree | f74610e63de1add373a0a699a406e2338101939c | |
| parent | d144f06fcc3afd9d32339608c7bc1cdb471abd08 [diff] | |
| parent | 6257ee0d4613c95aac817bd4a5c11167f6606745 [diff] |
resolved conflicts for merge of ccaf574b to master Change-Id: I83fd35ac579f05e7ae8e006e85791942dcefaf06