unused enum
Merge branch 'master' into ice-cream-sandwich
EInkOptions class
Merge branch 'master' into ice-cream-sandwich