From: Anton Hansson <hansson@google.com>
Date: Mon, 14 Jan 2019 10:07:52 +0000 (-0800)
Subject: [automerger skipped] Merge "Move Settings app to /product" am: 0a399bf543 am: 297fe94122
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a4449f4ad50d7a324ad99d0cd62dc85f8c83fe2e;p=android-x86%2Fpackages-apps-Settings.git

[automerger skipped] Merge "Move Settings app to /product" am: 0a399bf543 am: 297fe94122
am: 403fe5d83c -s ours
am skip reason: change_id Iee5940125af3f2a8543ecb3a68d7fba737acd77d with SHA1 f109282c8e is in history

Change-Id: I0c6d59fd5d2aa9233fc801e3ab002e3d8ecc5e65
---

a4449f4ad50d7a324ad99d0cd62dc85f8c83fe2e