From: Colin Cross <ccross@android.com>
Date: Thu, 30 May 2019 21:45:35 +0000 (-0700)
Subject: [automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c1b598b2183c5a8b188701e1bc820f528b85ee25;p=android-x86%2Fpackages-apps-Settings.git

[automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660
am: 8ddf9e7e3f -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: I8e7fd2f64f6ccd6ba0f8ef2809a93322a46ac87a
---

c1b598b2183c5a8b188701e1bc820f528b85ee25