| commit | c5586b8fd67cfab16004262443af4e16bdb6337d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 06 09:00:18 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 06 09:00:18 2011 -0800 |
| tree | 1fd44da99dabe440251fffd263cb41c5a0aa5a13 | |
| parent | 448bc9bb1c2dad274b101c42b853ba986bd3facb [diff] | |
| parent | f10ebf7ec104a740de2deb6259c7e682f5ad8763 [diff] |
am b7b605ff: Reconcile with ics-mr0-release * commit 'b7b605ff5b4682bc650461c2b987aa031a1071ca': DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource.