OSDN Git Service

resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
authorJim Miller <jaggies@google.com>
Wed, 15 Jul 2015 21:33:10 +0000 (14:33 -0700)
committerJim Miller <jaggies@google.com>
Wed, 15 Jul 2015 21:33:10 +0000 (14:33 -0700)
commitc7b0435cc709c328da8e2b515ea04c8bc40d1094
tree042daa8ffa664abb32492f27ba95a27a3f70aea8
parent2fc3216e2f8b77116594ca5cda2e927c43094039
parent1d4247c4cc89c6d62e44ed3115f26579979b44b5
resolved conflicts for merge of 1d4247c4 to mnc-dr-dev

Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
services/core/java/com/android/server/fingerprint/FingerprintService.java
services/core/java/com/android/server/policy/PhoneWindowManager.java