OSDN Git Service

Merge "[DO NOT MERGE] Increased user switch timeout to 3s" into nyc-mr2-dev
authorFyodor Kupolov <fkupolov@google.com>
Fri, 9 Dec 2016 20:10:59 +0000 (20:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Dec 2016 20:10:59 +0000 (20:10 +0000)
am: 8aa678b575

Change-Id: I703cb476b5e3cff50a266775ece86d954981cde0


Trivial merge