tree 4c731c21027ce9550bfeb90cd84fd07eb7023da8
parent 60d9265645499cd9bf35e7289cafe3271d79113a
parent 65312005a889ad73f2e55af2b6948b30503a1aa6
author The Android Open Source Project <initial-contribution@android.com> 1354232552 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354232552 -0800

am 65312005: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '65312005a889ad73f2e55af2b6948b30503a1aa6':
  kernel-headers: update msm_mdp.h original header