commit 75204654512e70b4bbf31ae2841a32971bc7cd4e
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Apr 17 21:43:51 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 17 21:43:51 2019 +0000
tree 6d95e347d88352be39864f868f8d4d1eb0f985a2
parent 60ea826a493683040a8cf8391b501dd50cdd46d6
parent 10d367bb69d94b96a71bd230bb7abd1577eca0c1

Merge changes from topic "am-c9436a7695ce48fda5b772e6490affc9" into qt-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "GameDriver" am: e10cb9bd1c am: a0bd6fd610 -s ours am skip reason: change_id If284bd3e0b29cb025833be29fa33179011c151d7 with SHA1 b33ffca825 is in history
  [automerger skipped] [GUP] Hard code the name of the whitelist file. am: be09eef818 am: 7d1d0c4f63 -s ours am skip reason: change_id Ibe9337b358b6a67600048f1661d73574d7bea607 with SHA1 3a1be746c0 is in history
  [automerger skipped] Add global property to store opt-in application package name. am: e23f59aa5a am: 4ce7aa1729 -s ours am skip reason: change_id I49dfcccf387169c072fb9345f7a50c00fcdb0737 with SHA1 2d5a2bb0ad is in history
  [automerger skipped] [GraphicsEnvironment] Add whitelist support. am: 443894f8bb am: 7808ff2cd8 -s ours am skip reason: change_id Ie36ca0173a90a8e48acaca2979ab64bbf92eeaed with SHA1 88c38eb6fe is in history