Michael Runge 647beed622 am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev ...

automerge: 8deabad

* commit '8deabad541984571496456646d6a7a91eccc9e42':
  Increase timeout when uncrypting OTA

2014-12-18 01:59:10 +00:00

..

accessibility

am 26c88954: am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev

2014-12-12 21:02:30 +00:00

appwidget

Restored widget provider id not properly updated.

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

backup

Correctly parse previous PMBA state during backup

2014-12-04 19:38:55 -08:00

core

am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev

2014-12-18 01:59:10 +00:00

devicepolicy

Merge "Added isRemovingAdmin method" into lmp-mr1-dev

2014-12-05 19:28:12 +00:00

java/com/android/server

am 8dd185b0: am 5d2c1e69: (Telecom-system part 3) Adding Telecom Loader Service

2014-12-09 00:18:08 +00:00

print

Increase bind remote print spooler timeout for eng builds.

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

restrictions

…

tests

Offer to "merge" subscribers for data usage.

2014-12-08 08:42:59 -08:00

usage

UsageStatsService: Update file index to prevent double checkin

2014-11-07 17:36:27 -08:00

usb

When switching to default USB function set, check restriction

2014-12-05 17:14:43 +00:00

voiceinteraction

Issue #17551667: Voice interaction service should be disabled...

2014-11-14 11:05:08 -08:00

Android.mk

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

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