OSDN Git Service

Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643
authorJoshua Mccloskey <joshmccloskey@google.com>
Thu, 5 Sep 2019 20:22:56 +0000 (13:22 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Sep 2019 20:22:56 +0000 (13:22 -0700)
am: 648db67fec

Change-Id: Id42bb590b657ab4e3ae5164f51dcc50abb62a544


Trivial merge