tree 630b9657f29cb549fe690d9bdd437a04f3bed3df
parent c342c60cb009c5c2c638a73dd2fbc0ae08390c3c
parent 7b6027dde49e5f14e9cde6de4fa542b146f41a2f
author Tao Bao <tbao@google.com> 1454613989 -0800
committer Tao Bao <tbao@google.com> 1454613989 -0800

resolve merge conflicts of 7b6027dde4 to master.

Change-Id: I1d5232f61744bb18ca5de3a16a340bc3afd110bb