| commit | 1ab8725378c28bb9096677d305765f5d9e2a871c | [log] [tgz] |
|---|---|---|
| author | Ivan Podogov <ginkage@google.com> | Tue Jan 03 12:02:18 2017 +0000 |
| committer | Ivan Podogov <ginkage@google.com> | Tue Jan 03 12:38:31 2017 +0000 |
| tree | 8ba989034e4d5fe8fc2e05438cb2f4ac3e22a25d | |
| parent | 9b01193770fe57cab003e7ab3d35749bb82dd88d [diff] | |
| parent | 43dc6e795cd7976424baebc3c9d387ecbc6131ea [diff] |
resolve merge conflicts of 43dc6e7 to master Test: make Change-Id: I7d49e2c1480e3296f8de25d5e8e94db7b58dd8f5