tree 866fe7133ad635ea4a746baba16fb9a518b5d3d0
parent 5116d074f790c01c6755cd5ec0c526379cd855dc
parent 5cb9648867b08760af8be780d5ce25ce06014e1a
author Christopher Ferris <cferris@google.com> 1547187662 -0800
committer android-build-merger <android-build-merger@google.com> 1547187662 -0800

Merge "Update kernel headers with new parser." am: 688028d7a5
am: 5cb9648867

Change-Id: If4b6de45b637e931bf0bd3e86fa97e10fd4dc71d