Christopher Tate cebcde3b5a resolve merge conflicts of 7641889 to lmp-mr1-dev ...

Change-Id: Ie162907d7388d0e388ab39bcf2471d19e2ce7020

2016-04-19 15:51:37 -07:00

..

accessibility

Fix broken activation of the selected view in accessibility mode.

2015-02-02 23:17:17 +00:00

appwidget

DO NOT MERGE Don't take flags when creating app widget config activity.

2015-06-01 12:55:38 -07:00

backup

Don't run full-data backups when backup is disabled

2015-01-29 15:47:43 -08:00

core

resolve merge conflicts of 7641889 to lmp-mr1-dev

2016-04-19 15:51:37 -07:00

devicepolicy

Fix NPE if FPE service does not exist.

2015-03-25 11:43:42 +00:00

java/com/android/server

NPE fix for SyncStorageEngine read authority

2016-02-19 23:38:33 +00:00

print

Increase bind remote print spooler timeout for eng builds.

2014-10-07 22:40:28 +00:00

restrictions

Rename getLocalApprovalIntent to createLocalApprovalIntent

2014-09-05 10:51:13 -07:00

tests

Sync extras bundle comparison can throw NPE am: c0f39c1ece

2015-11-13 01:50:11 +00:00

usage

UsageStatsService: Update file index to prevent double checkin

2014-11-07 17:36:27 -08:00

usb

When switching to default USB function set, check restriction

2014-12-05 17:14:43 +00:00

voiceinteraction

Issue #17551667: Voice interaction service should be disabled...

2014-11-14 11:05:08 -08:00

Android.mk

…