diff options
author | Amith Yamasani <yamasani@google.com> | 2010-09-22 17:06:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-22 17:06:48 -0700 |
commit | 483c4b1d1fca7695a3af8d0ad8402f9f452ac41b (patch) | |
tree | 07118c71c59376787542fd69de7c8d010f7a3879 /graphics/java/android/renderscript/ProgramFragment.java | |
parent | c188b3d0773a00929178f124ecac93457ddd1422 (diff) | |
parent | abdd2c7f03651e95424133c2be948238c6dc7bf6 (diff) |
am abdd2c7f: am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread
Merge commit 'abdd2c7f03651e95424133c2be948238c6dc7bf6'
* commit 'abdd2c7f03651e95424133c2be948238c6dc7bf6':
Fix NPE in PowerManagerService on boot, if some settings are corrupted.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions