Firefly 166307db44 [packages/apps/Settings] Merge tag 'android-5.1.1_r13' into zjwork ...

solve merger android-5.1.1_r13 conflict
Android 5.1.1 release 13

Signed-off-by: Firefly <service@t-firefly.com>

Conflicts:
	src/com/android/settings/sim/SimBootReceiver.java

2015-12-31 16:49:37 +08:00

..

res

[packages/apps/Settings] Add translations for Security Patch Level.

2015-12-31 16:49:29 +08:00

src/com/android/settings

[packages/apps/Settings] Merge tag 'android-5.1.1_r13' into zjwork

2015-12-31 16:49:37 +08:00

tests

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

Android.mk

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

AndroidManifest.xml

[packages/apps/Settings] Revert "Settings: add skip sim pin feature"

2015-12-31 16:48:49 +08:00

CleanSpec.mk

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

MODULE_LICENSE_APACHE2

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

NOTICE

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

proguard.flags

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00