tree 1aa01cb74233c7674737d9329aa8cf211c6456ce
parent 9990de1f643c9dc581e2977ae7222a21c39389b0
author Steven Moreland <smoreland@google.com> 1492194216 -0700
committer Steven Moreland <smoreland@google.com> 1492623594 -0700

libbase: fix build breakage

Two changes were merged at the same time that conflicted.

Test: builds
(cherry picked from commit 72b9d28423fb79eebdd4d74593ca03e1cbc7d75f)
Merged-In: Ia6c730804cd5a3b2655e6d69b8e4f346d198dabb
Change-Id: Ia6c730804cd5a3b2655e6d69b8e4f346d198dabb