Robin Lee 8e99586830 am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev ...

automerge: 23bb3f1

* commit '23bb3f11cbe4ca64337b5b75c333ea891760213f':
  Profile owner hint in warning for extra CAs

2015-01-07 12:43:41 +00:00

..

accessibility

am 26c88954: am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev

2014-12-12 21:02:30 +00:00

appwidget

Restored widget provider id not properly updated.

2014-10-08 03:13:06 +00:00

backup

Remove the "backup_data_changed" event log

2015-01-05 17:07:57 -08:00

core

am 8b2b71f5: am 71d8b8ce: Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev

2015-01-07 08:10:11 +00:00

devicepolicy

am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev

2015-01-07 12:43:41 +00:00

java/com/android/server

am 02775fca: am 8dd185b0: am 5d2c1e69: (Telecom-system part 3) Adding Telecom Loader Service

2014-12-09 23:20:31 +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

Remove deprecated version of setProfileOwner that takes packageName

2014-12-24 09:38:13 +00:00

usage

UsageStatsService: Update file index to prevent double checkin

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

usb

Rename UsbAudioManager to UsbAlsaManager

2014-12-19 10:08:36 -08:00

voiceinteraction

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

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

Android.mk

resolved conflicts for merge of 4cbee7d2 to lmp-dev-plus-aosp

2014-09-20 11:28:22 -07:00