Jeff Sharkey 937ede14d8 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5 am: a637e31547 -s ours am: a00521b3a0 am: 16776b64c8 ...

am: 1dcb8522fa

Change-Id: Ife1efc0fe5b721886961327dc72b6fcf2cf1ade9

2017-10-18 22:55:51 +00:00

res

resolve merge conflicts of f36b25c2df to stage-aosp-master am: d4621f6302

2017-10-16 19:25:57 +00:00

src/com/android/settings

Preserve old password when handling SET_NEW_PASSWORD.

2017-10-17 17:33:23 +00:00

tests

Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev

2017-10-12 19:02:55 +00:00

Android.mk

Merge "Remove unnecessary core-oj library"

2017-09-26 01:18:50 +00:00

AndroidManifest.xml

Merge "Fix wrong format in AndroidManifest.xml" am: de795d12d1 am: 39ddac51b6

2017-09-29 19:04:56 +00:00

CleanSpec.mk

CleanSpec!

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

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -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%