David Christie b7f8b59e24 resolve merge conflicts of b4a5615 to lmp-dev ...

am: 288166cbb2

Change-Id: Ie8927cbe2b224241f8d896487ff17117c15c0255

2016-08-12 20:09:54 +00: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

DO NOT MERGE: Don\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283

2016-06-16 22:27:18 +00:00

core

resolve merge conflicts of b4a5615 to lmp-dev

2016-08-12 20:09:54 +00:00

devicepolicy

DO NOT MERGE: Reduce shell power over user management.

2016-06-21 18:45:13 +00:00

java/com/android/server

Fix vulnerability where large GPS XTRA data can be injected.

2016-07-25 17:13:23 -07:00

print

Increase bind remote print spooler timeout for eng builds.

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

restrictions

…

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

…