| commit | 881f6f9266ca15e7c6302d659b07d06ecfe40300 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Jan 12 16:41:48 2016 -0800 |
| committer | Adam Lesinski <adamlesinski@google.com> | Tue Jan 12 16:41:48 2016 -0800 |
| tree | c7f7d65670f09c223c5376ab87a9f112845a3eb9 | |
| parent | de41d3cd5a28cce3ba7f0fa23ba7c41ef93b223d [diff] | |
| parent | 551fc6823a86e2f038b100f63c02f45bab40fdf4 [diff] |
resolve merge conflicts of 551fc6823a to master. Change-Id: I2778bf2a364c103fc0d351f2afc4fc73bede2f19