| commit | a7978d5bc3fcbe62a40e59e29aebea668385a98a | [log] [tgz] |
|---|---|---|
| author | Marcus Hagerott <mhagerott@google.com> | Thu Sep 22 15:31:46 2016 -0700 |
| committer | Marcus Hagerott <mhagerott@google.com> | Thu Sep 22 15:38:19 2016 -0700 |
| tree | 874fe9f9b4dc7d1015b221bea91445914bbddeb6 | |
| parent | 581585d9ad2e7d3d4b65798acaa0fa462d30710d [diff] | |
| parent | 949d4e88400761dac02992978f6b79997b5f0055 [diff] |
resolve merge conflicts of 949d4e8 to master Change-Id: I399652b6a1b756a8045c1fef092d10581d56400d