| commit | 06e7fe5a70409d2050b2b3e1286500f5223099da | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Thu Nov 20 17:27:36 2014 -0800 |
| committer | Chris Craik <ccraik@google.com> | Thu Nov 20 17:27:36 2014 -0800 |
| tree | b7eea29ebe9ffc345f68a879199e2904c5c78423 | |
| parent | b946358bb5afd9db6a0914171d3f237c77abbfea [diff] | |
| parent | f2235b6a48db2e16b52711570bf2a0d0cb0b0d90 [diff] |
resolve merge conflicts of f2235b6 to master. Change-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb