diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-12-05 19:20:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-05 19:20:45 -0800 |
| commit | deb86c63c33f766b1a7fd6916f56b757d40803b1 (patch) | |
| tree | b0fa805bd45446439e8bdd32e27d9b5d9519eba9 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fc2e4f6d01af0ed17030db9e19db6335e18c8ffd (diff) | |
| parent | ec42750e4d0e695515d078fb1f222c99a705fd93 (diff) | |
am ec42750e: am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1
* commit 'ec42750e4d0e695515d078fb1f222c99a705fd93':
Fix issue #5714517: App shortcuts can result in bad task intents
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions