Dianne Hackborn ef2bc5ccd4 am def99c9d: am 51bd2041: am bfa6190f: am 144508d5: Merge "Revert white space changes." into lmp-dev ...

* commit 'def99c9da6c47628ebe2b731387d98a79e63acdf':
  Revert white space changes.

2014-10-02 13:37:33 +00:00

..

accessibility

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

2014-10-02 14:32:37 +01: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 def99c9d: am 51bd2041: am bfa6190f: am 144508d5: Merge "Revert white space changes." into lmp-dev

2014-10-02 13:37:33 +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 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible"

2014-10-02 10:18:29 +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

Use VMRuntime.isBootClassPathOnDisk

2014-09-30 16:49:32 -07: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-mr1-dev-plus-aosp

2014-09-20 11:15:50 -07:00