Jeff Sharkey 1ddfd32006 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd ...

am: 9138455b41

Change-Id: I215d463a0b3631384c6963bd8217c912c286f594

2017-10-11 22:23:51 +00:00

res

Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"

2017-09-26 23:35:26 +00:00

src/com/android/settings

Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df

2017-10-11 21:26:28 +00:00

tests

Merge "Fix NPE crash in UsageAccessDetails"

2017-09-21 19:24:52 +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

2017-09-29 14:46:23 +00:00

CleanSpec.mk

CleanSpec!

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%