tree 535d3f1c5f2755161be53bc4cc764c83cdca6c22
parent 8621b26b59bccd5821863efd8c0430d580f4e64c
author Steven Moreland <smoreland@google.com> 1492194216 -0700
committer Steven Moreland <smoreland@google.com> 1492194216 -0700

libbase: fix build breakage

Two changes were merged at the same time that conflicted.

Test: builds
Change-Id: Ia6c730804cd5a3b2655e6d69b8e4f346d198dabb