OSDN Git Service

Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev am...
authorSuprabh Shukla <suprabh@google.com>
Tue, 16 Aug 2016 00:56:47 +0000 (00:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Aug 2016 00:56:47 +0000 (00:56 +0000)
am: ae54fae453

Change-Id: I9919c3614d5b757ab1bb84568eb836e4d7d3d0a5


Trivial merge