| commit | 8f120dd6d631ac632d3356b81403a53f958021f0 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed May 21 02:38:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 02:38:07 2014 +0000 |
| tree | 5a17b41b05b9045d85017258616f3fc559f0c65c | |
| parent | 3dc330af6b590ebd3c6529e8b123f51cebb134e2 [diff] | |
| parent | 0702786d81eb9f9bf47c3a0827d3f2824c3f4228 [diff] |
am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev * commit '0702786d81eb9f9bf47c3a0827d3f2824c3f4228': Allow display timeouts to be set in config.xml.