| commit | 6249e1022b21b1b5a0ed40191561fe7ea5d1e1ca | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Tue Jan 03 14:59:18 2017 -0800 |
| committer | Aurimas Liutikas <aurimas@google.com> | Tue Jan 03 14:59:18 2017 -0800 |
| tree | 7b9d2a8fa40469b31376abee1a75239db848a2bf | |
| parent | 7692e407e0067628a2b43bd9f34e32786351a1e6 [diff] | |
| parent | 4f0260dab2b1a064ee132dc882d2ca8084e6b2eb [diff] |
resolve merge conflicts of 4f0260dab2 to master Change-Id: I7d19a6a868d365b7b7825ec686956d59ab8358e4