| commit | 32cbdcc8c098b4a42212b3da345b929abad8ad6e | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Aug 31 13:51:50 2016 -0700 |
| committer | Jorim Jaggi <jjaggi@google.com> | Wed Aug 31 13:51:50 2016 -0700 |
| tree | 7f032320147a2b21fc6f2b0ea4e2e7e302eec9ff | |
| parent | 96692047e6fb0bf05c4efa8def51e5f4c61d1a39 [diff] | |
| parent | c5bafe26cbfee6a9e7274a00792cac72f4c874bf [diff] |
resolve merge conflicts of c5bafe2 to master Change-Id: I19dd5c88c664313c2f8b47d8f8fd556f630c8bf1