tree 76ac96304a498d90b2c56b3496712d0fcde32c58
parent 5be02ffb82445115889993acfd352a13eaa7abd6
author Al Sutton <alsutton@google.com> 1577459150 +0000
committer Al Sutton <alsutton@google.com> 1577459150 +0000

Revert "Move activity timeouts to ActivityRecord (81/n)"

This reverts commit 5be02ffb82445115889993acfd352a13eaa7abd6.

Reason for revert: Causing a build failure; http://android-build.googleplex.com/builds/branch-dashboard/git_master?build_id=6100543

Change-Id: Ie522364d784a574b3fdad67c25d9559b3720dd01