| commit | 04aee7baf4a2cdbd285eff09ff8bf8087b516b42 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Aug 30 19:46:24 2016 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Tue Aug 30 19:46:24 2016 -0700 |
| tree | b4cf742575bcc8ddc85c164c3981d3db752d31ff | |
| parent | 2d78dc7437b069b66a7791b4a887fcd35cfcf43a [diff] | |
| parent | 725b4e6f7d3311d83809b64bc0499a6a55f56092 [diff] |
resolve merge conflicts of 725b4e6 to master Change-Id: I79018a9586b8f7b5f69c8e54c8ce78b3acd81d35