tree 603d90593492fb898a8f76824192aaa03630c614
parent 876b9391c084701b147af3b0d5c933d877bb6052
parent 713ad360c41ff82ab471fd713f1dccfe16c5605b
author Tao Bao <tbao@google.com> 1475649338 -0700
committer Tao Bao <tbao@google.com> 1475649338 -0700

resolve merge conflicts of 713ad36 to master

Change-Id: I493df6f84005af600d92c6cb3df58de53a5c2d55