tree 8b706560f672da1ac891e5fd0ec6325d53477c3f
parent 4f4ff079ca455aea363d64e4199897ac73ece726
author Damien Martin-Guillerez <dmarting@google.com> 1467705397 +0200
committer Dmitry Lomov <dslomov@google.com> 1468318476 +0200

Fix fallout of incorrectly merged review (3921)

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

Change-Id: I018accd516c73cc63cd9368df2daa9c389c93bc3