tree 430089cdf7fc7c26a6610e53e6b553d9e88505e3
parent e6e2f6658a6fe97eaa0afda2881f928a0227720c
author Shawn Willden <swillden@google.com> 1439529785 -0600
committer Ian Pedowitz <ijpedowitz@google.com> 1444288150 +0000

Fix Shamu build breakage.

Change-Id: I54f5bcbee17b5031411e26e47e0b10bc3e4319b3
(cherry picked from commit 44b1ef05d4442f73a0f4ce891e59085a0254c306)