d747dc8179
Signed-off-by: Mike Lockwood <lockwood@android.com> Conflicts: policy/src/com/android/internal/policy/impl/PhoneWindowManager.java