| commit | 158b6c98508f111de041853cab1d7a87b771b651 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Nov 21 14:03:34 2014 -0800 |
| committer | Andreas Gampe <agampe@google.com> | Fri Nov 21 14:05:11 2014 -0800 |
| tree | 944b6e6e8bd709eba907b4c46d016fef0b71acc2 | |
| parent | 5e88177ecbfb0b9e3ca84d1168aed192e31d2c68 [diff] | |
| parent | 7d13d9db1ef90063cb542ccd6554042a6a3263b7 [diff] |
resolve merge conflicts of 7d13d9d to master. Change-Id: I4d8a7ec4a25471565859050939ec05b0c1261627