Christopher Tate 6184bc9813 am 61737d81: am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev automerge: 11bac0e automerge: ed1e999 ...

automerge: 29cef75

* commit '29cef75ddf0105ec045610760d94a896d2612525':
  Eliminate race condition around backup completion + resumption

2014-10-17 01:35:33 +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

Eliminate race condition around backup completion + resumption

2014-10-16 13:56:45 -07: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