diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-12-09 14:57:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-09 14:57:48 -0800 |
| commit | e2d4301f7119fc21ba5e867d9793cd73e089264b (patch) | |
| tree | 6afa66dae5d2124106f824f450c690bb058ba642 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1db7a31a45c234eb18bd788264591859bee64815 (diff) | |
| parent | 54854d311731b321e2bb2faec06bacb11d1fe07f (diff) | |
am 54854d31: Reconcile with ics-mr0-release ics-mr1-release
* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
More fixing for issue #5366535: Lockscreen has wrong layout...
DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions