tree 2d1a21bd7f62d6732e236c918e99bec9b64210a5
parent e1305768f69ed8a3cf810f1204a3a2c519747716
parent e5d3d15cd2f8a6787d1bac3fe09e36618743c365
author Yabin Cui <yabinc@google.com> 1456207947 -0800
committer Yabin Cui <yabinc@google.com> 1456208204 -0800

resolve merge conflicts of e5d3d15cd2 to nyc-dev

Change-Id: Ie8b30e6b114b648e8c03866456c64cf8b740d1e3