OSDN Git Service

Merge "Add timeout to StrictMode flash." into oc-dev
authorJeff Sharkey <jsharkey@google.com>
Thu, 8 Jun 2017 05:47:38 +0000 (05:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 05:47:38 +0000 (05:47 +0000)
commit13e4dfdcebe7ca083d38e3cb3a4ef0e3a8575788
tree3109dc181282790894a426be050988be2176113e
parent2bb4966dab391f0add9982fc14549d07194e1527
parentfdb3d31504bdaaad923d4add22cec9ba1ed5585f
Merge "Add timeout to StrictMode flash." into oc-dev
am: fdb3d31504

Change-Id: I646e27241743297d62a5442c845b61ee42b47a2f
services/core/java/com/android/server/wm/WindowManagerService.java