tree 4b2de12310f868035d57e0348bdd145ecebf37a2
parent f715513048ea39867cb7189cada44fa157fc0b63
parent a0b165ebb33a89fd0c89d969643e6e1f20727e3f
author Dan Albert <danalbert@google.com> 1482982053 +0000
committer android-build-merger <android-build-merger@google.com> 1482982053 +0000

Merge "Update bionic headers to c816e9f." am: 625fa539e4 am: 0a81f7979d
am: a0b165ebb3

Change-Id: Ifddccdf530a4fcf66590d0bc523a763799e06b2f