OSDN Git Service

resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev
authorBart Sears <bsears@google.com>
Wed, 18 Mar 2015 21:12:10 +0000 (14:12 -0700)
committerBart Sears <bsears@google.com>
Wed, 18 Mar 2015 21:12:10 +0000 (14:12 -0700)
commit91281bbdde1d8bcec993ff61044a5aa4897f3175
treebd7ee5aeb6a89ecebc0427c8043933a71dc88bb7
parentfbd99e9fecea1cf467c082d2096cb1c3868685d4
parentcc86bc0c923e358d97f572145bb090831f4a0636
resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev

Change-Id: Ifb6c4ec5560c50a4bb91426734d7e05cd0c46e93
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java