| commit | e017b64c19b5df8c045ed06f56f237ebc153ff1f | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Mon Aug 22 14:59:11 2016 +0100 |
| committer | Janis Danisevskis <jdanis@google.com> | Mon Aug 22 15:01:51 2016 +0100 |
| tree | 5cb76874115ee07ae1fe44df88778548e3f906d4 | |
| parent | 5fa51447d97988d919de1fdc21208c51730aaee0 [diff] | |
| parent | ef6d09c379f6dddd03fecc862c6ef80321fb8c94 [diff] |
resolve merge conflicts of ef6d09c to master Change-Id: I211040052cdf230221f3f0ba6f25b063c636b77e