summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-11-16 07:38:11 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-16 07:38:11 -0800
commitc172688d5e9a1d26e2792297939cbb7bd93acaf2 (patch)
treeb18d9306d1f0eae596ec734cb309a0757ebc6046 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
parent0f2dec5033919fab77a2b52bb3cf33cf4975f2c9 (diff)
parentc7403258528a08ab74f7c29277d0c34ba6edc53d (diff)
am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit 'c7403258528a08ab74f7c29277d0c34ba6edc53d': Fix bug in TextLayoutCacheKey handling embedded nulls. DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions