| commit | 6727859f42b91df02eb09f345a8a85076be2ac85 | [log] [tgz] |
|---|---|---|
| author | Marie Janssen <jamuraa@google.com> | Thu Dec 29 16:20:43 2016 -0800 |
| committer | Marie Janssen <jamuraa@google.com> | Thu Dec 29 16:20:43 2016 -0800 |
| tree | 75629cc0aefabb4c158f094d26208de864bf60b5 | |
| parent | d3b9e3169d8fc59208ee97f3547589d1c3debb89 [diff] | |
| parent | 825d8ff56a42908860b99cbd2ffeebcb96b8d2f2 [diff] |
resolve merge conflicts of 825d8ff to master Change-Id: I57ae47778f738dbea6a670b85f24161cfb544a16