| commit | 89311db9e26355dca3ddef1e99403cc1eb93f46c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:22:29 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:22:29 2012 -0700 |
| tree | 61f3e2b67a8a4026a23a0e288a54948e890944bc | |
| parent | 13990bb4ca3940daef5500bfcb08e584cd2acb13 [diff] | |
| parent | e2d4cc28d72db0d49e61ed4ceeb878436cafb23a [diff] |
am e2d4cc28: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'e2d4cc28d72db0d49e61ed4ceeb878436cafb23a': partially implement external display clipping Always set vertex alpha when drawing screenshot layers SurfaceFlinger: add animation transactions