diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-11-16 07:42:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-16 07:42:14 -0800 |
| commit | 5cf2a1399e8cd047e84e159e25c74c259882f52c (patch) | |
| tree | fc65566a6f27a3b1e7c52fe7299acff09d8885ee /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 862c2f5275cb6e8baed5c53d3f2742740f8909a8 (diff) | |
| parent | c172688d5e9a1d26e2792297939cbb7bd93acaf2 (diff) | |
am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit 'c172688d5e9a1d26e2792297939cbb7bd93acaf2':
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