tree b858a9b0ca4a26adee7c9f3394e52f5ae32541b2
parent 9932525b96dcdadcd3bf56cd5bbe91081c734be2
parent 6609d6fb4348b476ffb1fe193ceab5cdd89847ac
author Dan Willemsen <dwillemsen@google.com> 1489709871 +0000
committer android-build-merger <android-build-merger@google.com> 1489709871 +0000

Merge "Fixes for host bionic support"
am: 6609d6fb43

Change-Id: I89e3e5869658a9c5c198f0e55c94a33b706da444