Linus Tufvesson 41215b67a3 RESTRICT AUTOMERGE ...

This reverts commit 7d4adf4d46.

Reason for revert: Breaks apps using Presentation in combination with private virtual displays

Bug: 141745510
Change-Id: I15ded4f1a7cf152e331c853c128c91db173f3cd7

2020-04-01 13:31:34 +00:00

..

android

RESTRICT AUTOMERGE

2020-04-01 13:31:34 +00:00

com

DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f60801 to oc-dr1-dev

2018-10-31 16:29:12 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…