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)
commit183f8fa450ededc74dad717664e02ec804e8fe76
tree64d1e43fd00cf95ef40d9733b52fd95d4db745c0
parent1ebfbc08c0b7a793dc46fd5c4a0397ac617930f5
parent21605b3395372b1ee1dd645bb8d9e50c7e7e9460
am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev

* commit '21605b3395372b1ee1dd645bb8d9e50c7e7e9460':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
services/core/java/com/android/server/wm/WindowManagerService.java