tree 202685878831d2e520710490e0b392aaacf1468d
parent 3501e7c0d0d953c4f372bb5406c7234a63fc14b2
parent 0ce2f11a75359fd6630b909c7f624d4940734e1a
author Christopher Ferris <cferris@google.com> 1469643087 +0000
committer android-build-merger <android-build-merger@google.com> 1469643087 +0000

Merge \\\\"More kernel header updates.\\\\" am: 5806006ffa am: afdc10881b am: a500602aa0
am: 0ce2f11a75

Change-Id: I8ac1fbf28226366e7254bee639a99129f795eb3c