commit | 8f182abb7cc06317884ea435fa5526b433ab6eb7 | [log] [tgz] |
---|---|---|
author | Lucas Dupin <dupin@google.com> | Mon Jun 17 16:44:54 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 17 16:44:54 2019 -0700 |
tree | 81359bcc59272bb215482c2af1b75b50a395b974 | |
parent | e6936e2792cc7f5789a3c9811522bef08fe16c28 [diff] | |
parent | 706016714be995e2365e59aa77d3a5e3f5eebeae [diff] |
Merge "Merge "Shortened and adjustable screen timeouts" into qt-r1-dev am: 969c3d9b87" into qt-r1-dev-plus-aosp am: 706016714b Change-Id: Ie2f3a219e60d8b63d16360a3ae4bc5d109125b55