| commit | a9f6d4163515f72788e368df453f59e3c0d41f68 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jan 19 22:25:23 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 19 22:25:23 2018 +0000 |
| tree | 65aafbc9d115f72d8af152ae7300d1e2b497e2cd | |
| parent | 95c89da244e1f17168e46c3de367d4b75f7019c3 [diff] | |
| parent | cdeeaff473b66e97aec65e77e7e39eee31d42555 [diff] |
Merge "Block sleep options in Settings app when DISALLOW_CONFIG_SCREEN_TIMEOUT is set."