OSDN Git Service

Merge "Updated security settings string." into qt-r1-dev
authorJoshua Mccloskey <joshmccloskey@google.com>
Thu, 5 Sep 2019 20:17:36 +0000 (13:17 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Sep 2019 20:17:36 +0000 (13:17 -0700)
commitc542abdcaf7633d28f5a666981ae9daf12463dfd
treec1a6620df53b1616b1d366122657c93c31015ee7
parenta8e6569855a2aaa3280c6c8dd17871b9679fdc0b
parentb7ac44e6430271fc3868da0351ea2df57493ff02
Merge "Updated security settings string." into qt-r1-dev
am: b7ac44e643

Change-Id: Ife05eee951852b471138afb3f73fd4e153cc9d43
res/values/strings.xml