Sharvil Nanavati 64a4858b32 resolved conflicts for merge of 7c250056 to lmp-mr1-ub-dev ...

Change-Id: I8ec2e76756e61a6e6bbe85ca699facbde1c1fbc7

2015-06-23 14:07:26 -07:00

..

accessibility

am bdbd4736: Merge "Refinements to magnification for improved wearable support." into lmp-mr1-modular-dev

2015-02-19 01:06:51 +00:00

appwidget

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

2015-04-20 17:16:38 +00:00

backup

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00

core

resolved conflicts for merge of 7c250056 to lmp-mr1-ub-dev

2015-06-23 14:07:26 -07:00

devicepolicy

Fix NPE if FPE service does not exist.

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

java/com/android/server

am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev

2015-03-23 20:21:58 +00:00

print

…

restrictions

…

tests

Remove dead code, mostly DataStateTracker.

2015-03-11 10:03:58 -04: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

Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE

2015-05-21 14:25:05 -07:00

Android.mk

…