| commit | f5e51cf7a9417e1c06dbbb9547020c20ff7517f8 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 16 00:21:34 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 16 00:21:35 2016 +0000 |
| tree | 52054d6df42192e1cdebc8386d1a3ba00ae1534b | |
| parent | ab35493046263e76543b43856dececeb61532483 [diff] | |
| parent | cafdc2e50da6bd3ea3fc3f25e1603fc321903c75 [diff] |
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev