| commit | 729b0d2d8ed16a32c641d56285c7dfff69c1e77a | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Tue Aug 16 00:56:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 16 00:56:47 2016 +0000 |
| tree | fa3da4117c4ef4978f778ba7a88a34dfb03207d9 | |
| parent | c32b08da9d2a464c373bb217170e51a333a587f4 [diff] | |
| parent | ae54fae4533b3f0e12a205898dd77a5b28cdcca4 [diff] |
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev am: f5e51cf7a9 am: ae54fae453 Change-Id: I9919c3614d5b757ab1bb84568eb836e4d7d3d0a5