tree 02a4fef00ab0088cfcb0349213159557a44e8cc7
parent afbc86bef48b6046214ec1174d545a5c0314a0cd
parent 47893b63fe11b9df23dc1af0520d4b442eb7cfe8
author Andrew Chant <achant@google.com> 1565056800 -0700
committer android-build-merger <android-build-merger@google.com> 1565056800 -0700

Merge "sthal: using kernel header" into qt-r1-dev
am: 47893b63fe

Change-Id: I311bb8665331bb89216bf2e8734d23857dfbca0e