tree 7b95fb28090771be03bde23996ce1432c2d0061f
parent f485e6d3fb29fdeb06e950ddb83a6f28b6b41c06
author Damien Martin-Guillerez <dmarting@google.com> 1467705397 +0200
committer Dmitry Lomov <dslomov@google.com> 1468321200 +0200

Fix fallout of incorrectly merged review (3921)

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

Change-Id: I018accd516c73cc63cd9368df2daa9c389c93bc3