tree 5f3a056a1d56c90a7f0e53aa19d08a37261b0279
parent aa09516d427061ebc79800e2cc9ff3c07ec153d0
parent d59ce4d17a4ba908fd07f30f1ab2176fabf64f20
author Dan Albert <danalbert@google.com> 1518035002 +0000
committer android-build-merger <android-build-merger@google.com> 1518035002 +0000

Merge "Adapt to new inlines in bionic." am: e5a77d9bca am: dfe6d31734
am: d59ce4d17a

Change-Id: Ic22c8b10529e61f81ffcf783adb00a11fa5ac509