Jeff Sharkey a7a3479a85 Merge "Check upgrade certs before permissions." into lmp-mr1-dev automerge: e795533 ...

automerge: 05cff40

* commit '05cff4047d1c1d0552ce52a6af0151c6b1cc8e4f':
  Check upgrade certs before permissions.

2014-10-28 00:36:08 +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

Merge "Check upgrade certs before permissions." into lmp-mr1-dev automerge: e795533

2014-10-28 00:36:08 +00:00

devicepolicy

DevicePolicy: Restore CA warning to K behaviour

2014-10-20 20:55:40 +00:00

java/com/android/server

Get UsageStats if no PackageUsage is available for boot dexopt filtering.

2014-10-23 11:27:42 -07: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

Get UsageStats if no PackageUsage is available for boot dexopt filtering.

2014-10-23 11:27:42 -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