tree 22afb8c7ff8dc7a2c26b96c686aa4a0d7c22a642
parent c18c2d76758bf8679a8906536cc3c4d4541551df
parent 8418c10103cf6a6c628e890ad531f807346c0c99
author Christopher Ferris <cferris@google.com> 1469038664 +0000
committer android-build-merger <android-build-merger@google.com> 1469038664 +0000

Merge \\"Remove all android kernel uapi headers.\\" am: c5e5edc3dc
am: 8418c10103

Change-Id: I9630d692d9be5a170d731aaed236c7cf6cf67f19