commit | 215d9f13524476b9ebd92604014e1000dee211b5 | [log] [tgz] |
---|---|---|
author | Fyodor Kupolov <fkupolov@google.com> | Fri Dec 09 20:21:54 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 09 20:21:54 2016 +0000 |
tree | 604b5a8b9c43f10d6d2b3fec73304dea78e1f309 | |
parent | 5025f69a09df411b28c2734a36e8673e983d479f [diff] | |
parent | 0478fff36c4e7f77674aeb3202e8062ff58d3215 [diff] |
Merge "[DO NOT MERGE] Increased user switch timeout to 3s" into nyc-mr2-dev am: 8aa678b575 am: 0478fff36c -s ours Change-Id: I022cb5eb8de2255198957983a8929d151de4d171