| commit | df3bad37d2e3b52a86b18e0d9c84ede4d5098f92 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed May 21 02:41:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 02:41:00 2014 +0000 |
| tree | eddf05f50e4b63fbdc82a4cac1b4b2d08959cc77 | |
| parent | 42bff1ce2e7e5353a2349e60b033735270b4e543 [diff] | |
| parent | 8f120dd6d631ac632d3356b81403a53f958021f0 [diff] |
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.