OSDN Git Service

Merge "Update text for security preference." into oc-dev am: 74eee7838c
authorDoris Ling <dling@google.com>
Tue, 11 Apr 2017 15:36:44 +0000 (15:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 15:36:44 +0000 (15:36 +0000)
am: 47a44f0fea

Change-Id: Ie01fe04fce64d10fa0b6fdc04a68ed8e1623fc3d

1  2 
res/values/strings.xml

Simple merge