Commits
Jeff Brown authored and Android Git Automerger committed df3bad37d2eM
am 8f120dd6: am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev * commit '8f120dd6d631ac632d3356b81403a53f958021f0': Allow display timeouts to be set in config.xml.
Showing diff to42bff1ce2e7