diff options
| author | Cary Clark <cary@android.com> | 2010-09-21 11:51:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 11:51:23 -0700 |
| commit | 100cc263b465242c01dc9eb280d77ffaadbddd39 (patch) | |
| tree | d0b4c05fb54786cc79b079d74b12250b08fd8148 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7e8a16e884632c85a54dc351c0b4f79aea116237 (diff) | |
| parent | b5631f59d3b0411ed493dc382bb96ab15ca3304d (diff) | |
am b5631f59: Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread
Merge commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d' into gingerbread-plus-aosp
* commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d':
Do not merge : cancel text select mode when pressing back, etc.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions