OSDN Git Service

resolved conflicts for merge of 069d7e9b to master
authorAmith Yamasani <yamasani@google.com>
Fri, 10 May 2013 00:01:12 +0000 (17:01 -0700)
committerAmith Yamasani <yamasani@google.com>
Fri, 10 May 2013 00:07:08 +0000 (17:07 -0700)
commitecd5afe1ef4aa2a5d11ad4fa356fb6d5f461efb4
tree66a1d61588c842837f1bc4b8d81675f3aa33d90f
parent2d4edcf2e1ef94ef83e02ec2ad075b3603282812
parent069d7e9b81e17d31238e4d60420c3e31bb5e3b2f
resolved conflicts for merge of 069d7e9b to master

Change-Id: Ia8fd5de3d4cc275fd358132bcb2c198d1e7b6877
core/java/android/content/Intent.java
packages/Keyguard/src/com/android/keyguard/KeyguardCircleFramedDrawable.java
packages/Keyguard/src/com/android/keyguard/KeyguardMultiUserAvatar.java
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java