tree a1bc872886238cf7f50be21efe22bfd61138b3ab
parent 32722d7781bb5df999eea1b288c9f5338a542d27
parent 8357d9a3fa7a6ae0f7eda1bcd3ed69e46d2ae945
author Christopher Ferris <cferris@google.com> 1501355399 +0000
committer android-build-merger <android-build-merger@google.com> 1501355399 +0000

Merge "Update to kernel headers v4.12.3." am: 4c6f031b72
am: 8357d9a3fa

Change-Id: Ib6a6e03c08925c148e513e305a7dcc8683a1e6b0