tree 8ece57144982467f62d2076c458aa8617d6b249f
parent 23657915e59886f144f19e55dec723f8d66576ac
parent 47c16d37c15c262e470a1d429ab934fccaeec340
author Tyler Gunn <tgunn@google.com> 1449532702 -0800
committer Tyler Gunn <tgunn@google.com> 1449532702 -0800

resolve merge conflicts of 47c16d37c1 to master.

Change-Id: Ib1c968d20529ffcd5a16179944e1ec9fd27ab3a6