Jinsuk Kim 2dfb7397b4 am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev ...

automerge: 44ce605

* commit '44ce60502439d4ae37a5316efaaafbbeede3cda3':
  CEC: Use language code "chi" for Traditional Chinese

2014-10-30 19:09:06 +00:00

..

accessibility

am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev

2014-10-24 02:04:11 +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

am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev

2014-10-30 19:09:06 +00:00

devicepolicy

Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev

2014-10-28 16:13:05 +00:00

java/com/android/server

Merge "Fix not to show a log with empty default ime"

2014-10-30 03:02:01 +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

Merge "Follow API removal." into lmp-mr1-dev

2014-10-27 22:01:58 +00:00

usage

Get UsageStats if no PackageUsage is available for boot dexopt filtering.

2014-10-23 11:27:42 -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-dev-plus-aosp

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