| commit | 4b0b52c2572971fc491592bfce88a4af81058f2c | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Fri Nov 18 17:00:30 2016 -0800 |
| committer | Aurimas Liutikas <aurimas@google.com> | Fri Nov 18 17:00:30 2016 -0800 |
| tree | 79fc1a43f4ebe2c81563b13507ad2bb5739a9655 | |
| parent | 47fde50bf6c8ba73d2e2ab2813ad9b23d7effd47 [diff] | |
| parent | 69895b19d41d5249388af8e7fc4c1515ee76f23a [diff] |
resolve merge conflicts of 69895b1 to master Change-Id: I8f35e5a9c549b8f486dbeca07fc32c0f2fdab296