OSDN Git Service

[automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660
authorColin Cross <ccross@android.com>
Thu, 30 May 2019 21:45:35 +0000 (14:45 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 May 2019 21:45:35 +0000 (14:45 -0700)
am: 8ddf9e7e3f -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: I8e7fd2f64f6ccd6ba0f8ef2809a93322a46ac87a


Trivial merge