diff options
author | Jeff Tinker <jtinker@google.com> | 2011-12-09 14:25:49 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-09 14:25:49 -0800 |
commit | aac2f9c66ccb181544f822a1af7397a8e25455e7 (patch) | |
tree | 36f4aa1ad6d152ee8c1ee73ee3995db65cbe6646 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | bdc18b28eb04b8c8cc00313096f8bfb142e407e3 (diff) | |
parent | a5038d169f47b2e2278c0056495dfd4808803f8a (diff) |
am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions