tree 202685878831d2e520710490e0b392aaacf1468d
parent 8418c10103cf6a6c628e890ad531f807346c0c99
parent 5806006ffa4cc7097e8a11da8ca5e418f7158c0b
author Christopher Ferris <cferris@google.com> 1469642612 +0000
committer android-build-merger <android-build-merger@google.com> 1469642612 +0000

Merge \"More kernel header updates.\"
am: 5806006ffa

Change-Id: Ib29a5fe5b33ebb3eedc4f15c7277becd2a350500