OSDN Git Service

Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
authorJeff Brown <jeffbrown@google.com>
Wed, 21 May 2014 02:34:25 +0000 (02:34 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 21 May 2014 02:34:25 +0000 (02:34 +0000)
commit0702786d81eb9f9bf47c3a0827d3f2824c3f4228
tree9cec55e66f06fcdd051c227b92313ae3f9a7e011
parentf7963fab0decb70b72b848fe3d7a14c5ed54ff95
parent27736f5c0ada99bf2a7e007a1dec0ad51f65fa52
Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev