tree 293f3b3cd6e74b6cd56c2aec80042c6616f61394
parent 8d1ffa8b3c9dd183d8906d5b36de04796a47557a
author Damien Martin-Guillerez <dmarting@google.com> 1467705397 +0200
committer Dmitry Lomov <dslomov@google.com> 1468314666 +0200

Fix fallout of incorrectly merged review (3921)

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

Change-Id: I018accd516c73cc63cd9368df2daa9c389c93bc3