| commit | 726f419907d0c3f963640d983d02714a944175d3 | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Tue Aug 16 01:04:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 16 01:04:41 2016 +0000 |
| tree | 051c0ea97562610092e4803fd50ea60d6a17c618 | |
| parent | 20cbf386bc0e2b8a1a78e07f928b7ce9bb797283 [diff] | |
| parent | 729b0d2d8ed16a32c641d56285c7dfff69c1e77a [diff] |
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev am: f5e51cf7a9 am: ae54fae453 am: 729b0d2d8e Change-Id: I3ece2678948835a65303b58fbac175e284b34a7f