tree b858a9b0ca4a26adee7c9f3394e52f5ae32541b2
parent 391cbde92683a965a64ae78912cb98b2ce61b90f
parent 0e870b68aaee1d4d8f6a853e5773aaf67183f59a
author Dan Willemsen <dwillemsen@google.com> 1489710261 +0000
committer android-build-merger <android-build-merger@google.com> 1489710261 +0000

Merge "Fixes for host bionic support" am: 6609d6fb43 am: e0b553c6a8
am: 0e870b68aa

Change-Id: I846d3829881c688aa9035fdc971c765c1dce73c9