diff options
| author | Cary Clark <cary@android.com> | 2010-09-22 08:46:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-22 08:46:31 -0700 |
| commit | 6310aa605bdbc3262c6302583f81e888ecbeb67f (patch) | |
| tree | 720b9957725544f5bdb3cd223acf0b61813b37e4 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0e1d6876f93332eb430d31d48f627ad812abb29d (diff) | |
| parent | 27c65e26c9b395e5cc5db63ea7a1443bb91e8118 (diff) | |
am 27c65e26: (-s ours) am dd8f13fa: Merge "Do not merge: clear text selection on rotate" into gingerbread
Merge commit '27c65e26c9b395e5cc5db63ea7a1443bb91e8118'
* commit '27c65e26c9b395e5cc5db63ea7a1443bb91e8118':
Do not merge: clear text selection on rotate
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions