OSDN Git Service

Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
authorBenjamin Franz <bfranz@google.com>
Thu, 21 Jul 2016 10:05:33 +0000 (10:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 10:05:33 +0000 (10:05 +0000)
commit7abd7ba0932e882a8c4cea87a79de3e05c8451af
treea995dd8dd52c65b9fbaa517506b8c996e650c816
parenta09b6ee1650ebef2dca053cdd72cdeb8cbbf7737
parent3e582390b3cfcf82f51ac11d6d8f5074a91fb44b
Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
am: 3e582390b3

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