OSDN Git Service

resolved conflicts for merge of 57e82aad to mnc-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Fri, 29 May 2015 09:58:32 +0000 (10:58 +0100)
committerNarayan Kamath <narayan@google.com>
Fri, 29 May 2015 09:58:32 +0000 (10:58 +0100)
commitbd613068a38f5ae953e348e308d46271c4a59cec
tree8ba2cf66106e0e897c14498a5739744dfb066c5a
parent4eb5f942b70108b69749682511d036177a8f0d1f
parent57e82aad718f42ea12292b5c063d2c2ea1538bc4
resolved conflicts for merge of 57e82aad to mnc-dev-plus-aosp

Change-Id: Ib895c959b7403f959f326881a1dea4b81dda73e3
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java