| commit | 87bc9da29200344f7fdc95743a6441752451f6ce | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:42:37 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 15:42:37 2012 -0800 |
| tree | a7d02a448c4eabc2bec359d3d5d908c2a6ddd9a4 | |
| parent | 1ad83cdca98723e614a66b30b7825e9a8b1ec3b2 [diff] | |
| parent | 5dbb13c54be60b3d9070ca64ab902d1711c4d5bc [diff] |
am 5dbb13c5: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '5dbb13c54be60b3d9070ca64ab902d1711c4d5bc': mako: enable 4-layer MDP composition