Yohei Yukawa f5051e9b67 am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev ...

automerge: b1f5643

* commit 'b1f56430d38f9d6bab0a3512905daaf994ba134b':
  Conditionally allow non-primay profiles to use TextServices

2014-11-01 02:19:02 +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 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev

2014-11-01 02:19:02 +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

…

tests

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

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

usage

Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev

2014-10-29 23:11:54 +00: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