tree 83ecf4f2c7e677eb6d29c71c4db44435e078f6cb
parent 73f0299490ec93e3a0135b349f620bf7b9061d0a
parent d31e23ff7f4401ef5085168bf61fd6ddf4812efc
author Samuel Tan <samueltan@google.com> 1450320958 -0800
committer Samuel Tan <samueltan@google.com> 1450320958 -0800

resolve merge conflicts of ee6b4b6467 to master.

Change-Id: Ia17df264a6d7800a8fd2f0d39c2017ab48181894