tree 5b3c1ce208db23d64328b69a4ebf85b1bde72abf
parent 60b8ad3b86a9a899c84f4895916dfabf1786eaf7
parent 23ec4fd7e6406fa15a6d6a82aa1de5306c0ea2bc
author Dan Willemsen <dwillemsen@google.com> 1505955376 +0000
committer android-build-merger <android-build-merger@google.com> 1505955376 +0000

Merge changes from topic "host_bionic" am: 6e6e1abb89 am: 9938cdeee8
am: 23ec4fd7e6

Change-Id: Ieb803f66f1f0f7bd29fea16df7e48f3c0195e3bf