9a12a3c8d4
Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp * commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e': Remove dead code, and make the animation a setting. turn off the electron beam