am 31e84850
: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '31e8485028e93c16312c57b5bb6b511e3bc8582d': workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
This commit is contained in:
commit
7fbe8e12da