tree 5c7d34e9ab88110cf1279e31485e7093e44a3012
parent 92720e103385f525e9c6383cf755431f3307c8ca
parent c72a04529d4f9a3dce86f69a36ca4ce522618be1
author Christopher Ferris <cferris@google.com> 1568740784 -0700
committer android-build-merger <android-build-merger@google.com> 1568740784 -0700

[automerger skipped] Merge "Use bionic platform headers." am: 539d37679c am: 36469ac071 am: bf6df9ed52
am: c72a04529d -s ours
am skip reason: change_id Ieed72d4e15c0ce0dfc3a4f3383ea6563905bc236 with SHA1 8269f3a377 is in history

Change-Id: I074f4d23780bca4166c651faa4c4a97b924be177