Jinsuk Kim dcc8004377 am 7a78e578: Merge "CEC: add getDeviceList()" into lmp-mr1-dev ...

automerge: f5e6935

* commit 'f5e693510153ecf855d7d2d807bd36b1bd9be28c':
  CEC: add getDeviceList()

2014-10-20 03:28:32 +00:00

..

accessibility

am f08b7ce9: am f247b908: am 4183a2fc: am 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev

2014-10-18 00:13:01 +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 7a78e578: Merge "CEC: add getDeviceList()" into lmp-mr1-dev

2014-10-20 03:28:32 +00:00

devicepolicy

Use the correct method to check if device is encrypted

2014-10-17 11:43:57 -07: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