tree 5b3efe9d075c2d267370d5b2259ad7d0e4677c96
parent c0583f54e4892eeac2705f6433bf950d1c673c6c
parent 70237dc67552afea152dc2933ebc4f93cc97e0cc
author Dees_Troy <dees_troy@teamw.in> 1362101856 -0600
committer Gerrit Code Review <gerrit@5.9.244.119> 1362101856 -0600

Merge "Add 2 second pre-dim and bugfix blank timer" into twrp2.4