Andreas Gampe dfdc6acc48 resolved conflicts for merge of 3c8cf51f into stage-aosp-master ...

Change-Id: I507358be6186c4b8d1968cd4e370afe9fd1a02eb

2014-10-28 20:42:53 -07:00

..

accessibility

am 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev

2014-10-17 23:56:57 +00:00

appwidget

Restored widget provider id not properly updated.

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

backup

Eliminate race condition around backup completion + resumption

2014-10-16 13:56:45 -07:00

core

resolved conflicts for merge of 3c8cf51f into stage-aosp-master

2014-10-28 20:42:53 -07:00

devicepolicy

Use the correct method to check if device is encrypted

2014-10-17 11:43:57 -07:00

java/com/android/server

Stop using apache http to download Gps XTRA data.

2014-10-24 13:41:27 +01:00

print

Handle user changes off the main thread.

2014-09-04 18:57:05 -07:00

restrictions

Rename getLocalApprovalIntent to createLocalApprovalIntent

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

tests

Fix lock ordering in JobScheduler

2014-09-23 17:34:46 -07:00

usage

Use VMRuntime.isBootClassPathOnDisk

2014-09-30 16:49:32 -07:00

usb

…

voiceinteraction

Fix issues with multiple languages and multi-users

2014-09-15 19:59:09 -07:00

Android.mk

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

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