tree f86f747c292be6742601154501e6132335705308
parent 2f06a3320c72336bbfb7e07ff50842a7698ea637
parent 37a232010308a8f0ac642c03c6b395ccfe6532ef
author Steve Pfetsch <spfetsch@google.com> 1461031873 +0000
committer android-build-merger <android-build-merger@google.com> 1461031873 +0000

Merge "msm8996: Update kernel headers for AU 134 am: 05abf07719 am: 48ac587e6b" into nyc-mr1-dev-plus-aosp
am: 37a2320103

* commit '37a232010308a8f0ac642c03c6b395ccfe6532ef':

Change-Id: Ic59536cb6c87f0b7db45414a1cc3af0ff9eb9981