diff options
author | Amith Yamasani <yamasani@google.com> | 2010-09-22 16:35:11 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-22 16:35:11 -0700 |
commit | abdd2c7f03651e95424133c2be948238c6dc7bf6 (patch) | |
tree | 7b524ddc70900bdbd1264ac3c76ec2f2606e7d51 /graphics/java/android/renderscript/ProgramFragment.java | |
parent | 11746caaa852984ff186bf5b8807e2c14cd7c1bc (diff) | |
parent | 95f600b55f617fcc94985fee07927aff48160362 (diff) |
am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread
Merge commit '95f600b55f617fcc94985fee07927aff48160362' into gingerbread-plus-aosp
* commit '95f600b55f617fcc94985fee07927aff48160362':
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