tree 341caafd879293697071efb0447e40f120fa8de4
parent 57db2c0dc624e8f16fedfb0717b825959f648a69
parent 723462eba9f3e421fb1c3955b0f45cb7c63d29bc
author Guang Zhu <guangzhu@google.com> 1447983808 -0800
committer Guang Zhu <guangzhu@google.com> 1447983808 -0800

resolve merge conflicts of 723462eba9 to master.

Change-Id: I34f085ba12ab2602a144a2cbd933cfd5c030748f