| commit | f056972aa3d4e17c8c7d6f66a746c9baa2d15812 | [log] [tgz] |
|---|---|---|
| author | Walter Jang <wjang@google.com> | Mon Sep 12 09:16:30 2016 -0700 |
| committer | Walter Jang <wjang@google.com> | Mon Sep 12 09:16:30 2016 -0700 |
| tree | 2d3321bae6c23e94f1bb395521a661067c26703a | |
| parent | 5a49696d7f82a395980ed918f3e86c93222734d4 [diff] | |
| parent | 552e5828fb8217da69fb68d045f5d3a613d76951 [diff] |
resolve merge conflicts of 552e582 to master Change-Id: I1f7c08d9be9bec632186acb489ac2881c0c2d666