diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-12-05 19:18:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-05 19:18:34 -0800 |
| commit | ec42750e4d0e695515d078fb1f222c99a705fd93 (patch) | |
| tree | f65f21fdd02011d1b8b10a85f2039fbe0245d105 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 24ec870322c801b0662d8b8d53232e89a94bc00a (diff) | |
| parent | 0c0120efa2dedaf25ae789bced5a3f9fa33c32bb (diff) | |
am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1
* commit '0c0120efa2dedaf25ae789bced5a3f9fa33c32bb':
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