tree 1538cb19c557e756a3ff6c9ab17d73001c4b8c43
parent a7e7cef9490c79d9d8d8ea3ffeb79328fc34ad90
parent 725833e024211012fd7bf6c2af9c781b4a289fbf
author Tao Bao <tbao@google.com> 1454043539 -0800
committer Tao Bao <tbao@google.com> 1454043539 -0800

resolve merge conflicts of 725833e024 to master.

Change-Id: I68b8737e3bc2bd7bffd7625114723bc1efa47398