diff options
author | Dave Platt <dplatt@google.com> | 2014-03-19 01:12:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 01:12:52 +0000 |
commit | eac88aae957c72e02ea9f2747ffc290829bcacb1 (patch) | |
tree | b794f7e1441338b6265a2c811d7ad6e04464d63a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f9c69fc8b809b295540ea737d194b061159a500b (diff) | |
parent | 28e9f76dcefb53a493fed74b0ccaac650755f069 (diff) |
am 28e9f76d: am c76bccd6: am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev
* commit '28e9f76dcefb53a493fed74b0ccaac650755f069':
Harden NsdManager against null-dereference crashes
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions