tree abe63bbcef9ac364ac721fffb430d9ecd52e6ba0
parent e2504b51d020421d257335e78f81cb8d3b5ee37c
author Alistair Strachan <astrachan@google.com> 1554576819 -0700
committer Alistair Strachan <astrachan@google.com> 1554728976 +0000

Fix merge issue with 4.4.178

Change-Id: I4bd7f3c192046b4e7fc257f03b9cf1fea18e13f7
Signed-off-by: Alistair Strachan <astrachan@google.com>
(cherry picked from commit 07797f0ce78953f8527f708fbf79857d3f3ed479)