am 1dade011: am 7ddc3cec: Merge "Reorder config.xml constants related to...
am 1dade011: am 7ddc3cec: Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev
* commit '1dade011':
Reorder config.xml constants related to auto-rotation.