| commit | e298ded6ade9744f2a79cae045b5c324886262f4 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Mon Mar 16 11:54:19 2015 +0000 |
| committer | Nicolas Geoffray <ngeoffray@google.com> | Mon Mar 16 11:54:19 2015 +0000 |
| tree | 0b16bb0fe3430dd224dabf4b3c87176ba1b0f91c | |
| parent | a4614fe5bfaafd0ff6be60ddb6fd135f99f5a5a5 [diff] | |
| parent | 6066d41889ada93c5312e081d5bdff94fc1fd2af [diff] |
resolved conflicts for merge of 6066d418 to master Change-Id: I2aa9721365e96c363648dd8e9e15718ed50e3c12