tree cfafaa7af6ad0b960eca4891c097ec7f44ff9eff
parent 3a6e38b91fe8589c219f2e8a46256eb4e68cce62
author Damien Martin-Guillerez <dmarting@google.com> 1467705397 +0200
committer Dmitry Lomov <dslomov@google.com> 1468313577 +0200

Fix fallout of incorrectly merged review (3921)

This review was merged at the wrong patchset leaving some change behind.

Change-Id: I018accd516c73cc63cd9368df2daa9c389c93bc3