| commit | 0702786d81eb9f9bf47c3a0827d3f2824c3f4228 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed May 21 02:34:25 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 21 02:34:25 2014 +0000 |
| tree | 9cec55e66f06fcdd051c227b92313ae3f9a7e011 | |
| parent | f7963fab0decb70b72b848fe3d7a14c5ed54ff95 [diff] | |
| parent | 27736f5c0ada99bf2a7e007a1dec0ad51f65fa52 [diff] |
Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev