tree 06d67cf005f4b450ac4e7f83bf6d859563f360b7
parent 86f811819924a5b2c8a0df1fddc3ab47f4a07146
parent 529c736eb2d279ba8dd92bf860fc9d1a34657340
author Shawn Guo <shawn.guo@linaro.org> 1538423319 -0700
committer android-build-merger <android-build-merger@google.com> 1538423319 -0700

Update kernel to fix the breakage caused by P merge
am: 529c736eb2

Change-Id: I87f8b8aeab2f42e3798e7ee761375834936e8163