Atanas Kirilov 8c94fb33e0 Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into nyc-mr2-dev ...

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
  [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 am: 5ddeef7116 am: 1890afd456

2018-04-09 22:24:28 +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 nyc-mr2-dev

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

devicepolicy

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

2017-09-11 14:36:08 +00:00

java/com/android/server

Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev

2017-04-12 01:55:57 +00:00

midi

…

net

Eschew unspecified IP addresses for DNS servers

2017-01-19 15:27:08 +09:00

print

…

restrictions

…

retaildemo

Enable SMS in carrier demo mode

2017-01-31 19:40:40 -08:00

tests

Don't crash when primary volume is null in AppCollector.

2017-02-22 01:14:35 +00:00

usage

Handle charging state separately from temporary parole

2016-09-15 13:38:43 -07:00

usb

Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE]

2017-02-13 17:44:11 -08:00

voiceinteraction

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

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

Android.mk

…