OSDN Git Service

Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev
authorFilip Gruszczynski <gruszczy@google.com>
Fri, 22 May 2015 00:02:47 +0000 (00:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 May 2015 00:02:48 +0000 (00:02 +0000)
commit91e5b0f598f19499e55dcb8f0243b430e3c1ee4f
treede7adfc416faffc9c0c02e504f2ca62917a140e1
parente4b47614b7f07dedabe316b5263ec37249ce9c15
parentc7becb7ee78881646251ff4846e63eb6b96bf7ec
Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev
services/core/java/com/android/server/policy/PhoneWindowManager.java