tree c7f7d65670f09c223c5376ab87a9f112845a3eb9
parent de41d3cd5a28cce3ba7f0fa23ba7c41ef93b223d
parent 551fc6823a86e2f038b100f63c02f45bab40fdf4
author Adam Lesinski <adamlesinski@google.com> 1452645708 -0800
committer Adam Lesinski <adamlesinski@google.com> 1452645708 -0800

resolve merge conflicts of 551fc6823a to master.

Change-Id: I2778bf2a364c103fc0d351f2afc4fc73bede2f19