diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-10-18 17:04:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 17:04:47 -0700 |
| commit | b65058a45544ba4b9ff5dbad3cc306d86e9554e5 (patch) | |
| tree | 13752e1e5bc65f8ad24bb3cd0975cbec46cf5719 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7dced8de3813aa42edb59e13e3ea3a2657d06125 (diff) | |
| parent | 6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6 (diff) | |
am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread
Merge commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6' into gingerbread-plus-aosp
* commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6':
Don't force ended when full screen video is returned manually.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions