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

* commit 'd6d5cbb02a263bb8b5ae9e3721b3ee80575c110a':
  msm_mdp: Update header for 4 layer support
This commit is contained in:
The Android Open Source Project 2012-11-29 15:42:37 -08:00 committed by Android Git Automerger
commit e12a238d41

Diff Content Not Available