RoboErik 129874b2d9 am 9eef5bf8: Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev ...

* commit '9eef5bf8d1a69879ada3176c839676dc82b14daf':
  Be more paranoid about threading in MediaSessionRecord

2014-09-30 14:55:24 +00:00

..

accessibility

Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev

2014-09-26 01:28:36 +00:00

appwidget

Fix a bug in parsing app widget state XML.

2014-09-22 12:31:04 -07:00

backup

Track enable/disable of transport components

2014-09-12 22:01:12 +00:00

core

am 9eef5bf8: Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev

2014-09-30 14:55:24 +00:00

devicepolicy

Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev

2014-09-25 16:42:11 +00:00

java/com/android/server

am 6f954cf2: Merge "Frameworks/base: Early init native bridge"

2014-09-24 22:10:15 +00: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

Merge "UsageStats should deal with changing time" into lmp-dev

2014-09-12 01:42:21 +00:00

usb

Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager

2014-08-29 17:29:27 -07:00

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