Merge "[DO NOT MERGE] Increased user switch timeout to 3s" into nyc-mr2-dev am: 8aa678b575

am: 0478fff36c  -s ours

Change-Id: I022cb5eb8de2255198957983a8929d151de4d171
This commit is contained in:
Fyodor Kupolov
2016-12-09 20:21:54 +00:00
committed by android-build-merger

Diff Content Not Available