OSDN Git Service

resolved conflicts for merge of d2794f5e to master
authorCraig Mautner <cmautner@google.com>
Sat, 22 Feb 2014 01:52:15 +0000 (17:52 -0800)
committerCraig Mautner <cmautner@google.com>
Sat, 22 Feb 2014 01:52:15 +0000 (17:52 -0800)
commit5eb4adcbda0ff22e48716d3cf9356a9a720475b5
treec90ba0b3a60dbb484a9fd36321d54ab6b9cc3962
parent550267f72b6217f797e7f93bb312ecbe6541ff49
parentd2794f5eb308940e73906b97eb2e2f22edfbc78e
resolved conflicts for merge of d2794f5e to master

Change-Id: I24339e45e5fc697abf294286e2d6b57620ed9d1a
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
services/core/java/com/android/server/wm/WindowManagerService.java