| commit | 7fbe8e12da662380374c1bdb7856f3152d5aa7c0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 28 09:49:34 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 28 09:49:34 2012 -0800 |
| tree | 87abab333c202a8bdbc2ad2d2155209bccae8158 | |
| parent | 9913b9941ef90a98d826f3338c0a1ec3e4497b8c [diff] | |
| parent | 31e8485028e93c16312c57b5bb6b511e3bc8582d [diff] |
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]