Kousuke Kitahara 7d906895e8 [automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen" ...

am: e8b70d7422  -s ours

Change-Id: I16c7823773e1a1ca070bfc5189be080996f0d38e

2018-03-28 20:49:50 +00:00

res

Merge "DO NOT MERGE: Change encryption preference's summary accordingly"

2018-03-06 18:55:54 +00:00

src/com/android/settings

Merge "Donot disable Wi-Fi Calling when getting "registration error" intent."

2018-03-08 19:13:20 +00:00

tests

packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE

2018-03-01 14:34:01 +00:00

Android.mk

packages/apps/Settings: Set LOCAL_SDK_VERSION where possible.

2018-02-22 16:12:29 +00:00

AndroidManifest.xml

OPP: Prevent sending intent while orientation change

2018-02-13 18:53:34 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

OWNERS

Add owners to setting packages.

2017-11-20 16:39:59 -08:00

PREUPLOAD.cfg

Point to the new checkstyle location for packages/apps/Settings PREUPLOAD hook.

2016-12-15 15:06:04 -08:00

proguard.flags

Keep classes/fields only used via reflection

2016-08-01 23:47:53 +00:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%