tree f236d4c7a1f8384b49d429cd46c704deffd8d5cb
parent 2bbaa7f61b3d72444663668d8b7604d3414ee2e1
parent a768648acbcc235ca6d31993cacec8cca68843a4
author Chris Phoenix <cphoenix@google.com> 1456274791 +0000
committer android-build-merger <android-build-merger@google.com> 1456274791 +0000

Make it build under Android
am: a768648acb

* commit 'a768648acbcc235ca6d31993cacec8cca68843a4':
  Make it build under Android