tree d26c47fc61dd7aad64ae61b53a9f2ac2f998f9a6
parent f94a8f1dd837522a0ebba48834f88bf68a7004e8
author Ankur Mittal <anmittal@google.com> 1495145269 -0700
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> 1495219809 +0000

Merge instead of rebase on update

Fast forward merge instead of rebase on jiri update

Change-Id: I7a3bc50f6433f822222a1822ac17b3204a8eaad2