Nick Kralevich 2ae769782e resolved conflicts for merge of ef9b1643 to master ...

Change-Id: Ifcde272f882e55998b16e02cca1e827dec35ce6f

2014-12-02 16:22:57 -08:00

..

accessibility

am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev

2014-10-24 02:04:11 +00:00

appwidget

…

backup

Don't crash if a system restore fails before constructing the PMBA

2014-12-01 14:37:28 -08:00

core

resolved conflicts for merge of ef9b1643 to master

2014-12-02 16:22:57 -08:00

devicepolicy

am 0d122e26: am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev

2014-11-26 12:09:51 +00:00

java/com/android/server

am c25cfc57: am 24d02652: Merge "Prevent EntropyMixer from registering with service manager."

2014-12-01 23:59:50 +00:00

print

…

restrictions

…

tests

Eliminate race conditions in UID-based network filtering.

2014-11-21 08:07:13 -08:00

usage

UsageStatsService: Update file index to prevent double checkin

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

usb

Remove polling for ALSA device files in USB audio device detection.

2014-12-01 12:21:41 -08:00

voiceinteraction

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

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

Android.mk

…