From: Yiwei Zhang <zzyiwei@google.com>
Date: Fri, 19 Apr 2019 00:57:36 +0000 (-0700)
Subject: [automerger skipped] Game Driver: rename GUP to Game Driver am: 046b9a8ca2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=667b4f61594110c3d9badacdd836840dca6abd54;p=android-x86%2Fpackages-apps-Settings.git

[automerger skipped] Game Driver: rename GUP to Game Driver am: 046b9a8ca2
am: eb5f8b1139 -s ours
am skip reason: change_id Ia7b9e3978ad96436a66843e6b5d1bd1e15f367c9 with SHA1 bf854fc41b is in history

Change-Id: I9f7b40977c4464ff5605c490d11deab8061095aa
---

667b4f61594110c3d9badacdd836840dca6abd54