commit | c40e5d7f8dcc6f4f271a7902d7fd23c6984b1ebc | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:42:32 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 15:42:32 2012 -0800 |
tree | 4c731c21027ce9550bfeb90cd84fd07eb7023da8 | |
parent | 60d9265645499cd9bf35e7289cafe3271d79113a [diff] | |
parent | 65312005a889ad73f2e55af2b6948b30503a1aa6 [diff] |
am 65312005: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '65312005a889ad73f2e55af2b6948b30503a1aa6': kernel-headers: update msm_mdp.h original header