OSDN Git Service

am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of...
authorFilip Gruszczynski <gruszczy@google.com>
Mon, 1 Jun 2015 18:49:47 +0000 (18:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 18:49:47 +0000 (18:49 +0000)
* commit '21605b3395372b1ee1dd645bb8d9e50c7e7e9460':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""

1  2 
services/core/java/com/android/server/wm/WindowManagerService.java