Atanas Kirilov 75b5dc8fb9 Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into cw-f-dev ...

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

2018-06-27 23:29:41 +00:00

..

accessibility

[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8 am: fb67a0f5f3 am: 2cb239cf3c

2018-05-10 17:40:57 +00:00

appwidget

[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61

2018-04-09 22:24:16 +00:00

backup

Respect restoreAnyVersion=true in full-data restore path

2016-10-11 15:29:39 -07:00

core

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into cw-f-dev

2018-06-27 23:29:41 +00:00

devicepolicy

resolve merge conflicts of 56a2b52937 to nyc-dev am: d7dcc3e227 am: 34377e0357

2017-09-11 14:28:44 +00:00

java/com/android/server

DO NOT MERGE: Add WearDisplayService to the system server;

2017-04-05 17:16:39 -07:00

midi

…

net

DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev

2016-11-14 21:35:45 +09:00

print

…

restrictions

…

retaildemo

Enabling wifi on new demo session

2016-09-23 14:14:41 -07:00

tests

Add option to skip and avoid captive portals.

2016-10-20 18:50:46 +00:00

usage

…

usb

…

voiceinteraction

Only purge sound models that violate the new primary key constraint if

2016-10-18 15:36:27 -07:00

Android.mk

…