tree 52054d6df42192e1cdebc8386d1a3ba00ae1534b
parent ab35493046263e76543b43856dececeb61532483
parent cafdc2e50da6bd3ea3fc3f25e1603fc321903c75
author TreeHugger Robot <treehugger-gerrit@google.com> 1471306894 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1471306895 +0000

Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev