xinhe d1b16557c6 Merge "telephony re-registry error" into lmp-mr1-dev automerge: efdddef automerge: 094c313 ...

automerge: be8d287

* commit 'be8d2875333054bbb409d94a3a761f23caba2c3a':
  telephony re-registry error

2014-10-17 00:06:35 +00:00

..

accessibility

am 216d08ff: am 0ee1d87c: am 515f14d4: am b22552c3: Merge "Send accessibility events with no window." into lmp-dev

2014-10-16 19:56:04 +00:00

appwidget

Restored widget provider id not properly updated.

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

backup

Fix spurious restore session timeouts

2014-10-16 01:34:01 +00:00

core

Merge "telephony re-registry error" into lmp-mr1-dev automerge: efdddef automerge: 094c313

2014-10-17 00:06:35 +00:00

devicepolicy

Merge "Fix admin policies in managed profiles" into lmp-dev

2014-10-15 17:44:24 +00:00

java/com/android/server

Add system property config.disable_networktime to configure NetworkTimeUpdateService

2014-10-16 13:33:25 -07:00

print

Increase bind remote print spooler timeout for eng builds.

2014-10-07 22:40:28 +00:00

restrictions

…

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

…

Android.mk

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

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