OSDN Git Service

resolve merge conflicts of dcc79d83cb to nyc-dev-plus-aosp
authorSami Tolvanen <samitolvanen@google.com>
Tue, 16 Feb 2016 23:15:46 +0000 (15:15 -0800)
committerSami Tolvanen <samitolvanen@google.com>
Tue, 16 Feb 2016 23:15:46 +0000 (15:15 -0800)
commit37e394e7d5965ac2b29e5681fe4107d6f4dbb38c
tree466fd5bec569182f326ec5447ec4fba5cd18403b
parent597062a34b262a990160387a7b06544051858b43
parentdcc79d83cb61a1996f627cf004a69eb019126070
resolve merge conflicts of dcc79d83cb to nyc-dev-plus-aosp

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