tree 5ba5696613ad39a0a1dabb5285db8d846e19e319
parent bb8f31f735c378bdf1d1482c0311e31d89eda0cc
author Ariel Gertzenstein <agertzen@google.com> 1479164908 -0500
committer Ariel Gertzenstein <agertzen@google.com> 1479235989 -0500

Fix issues preventing building Angelfish on the wear-master branch.

Change-Id: Icbac6c0ed9e1dec7f73a9eafd7205f99f37db568