OSDN Git Service

Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev am: 6dfafa5d95
authorFan Zhang <zhfan@google.com>
Mon, 19 Jun 2017 23:45:43 +0000 (23:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 23:45:43 +0000 (23:45 +0000)
am: f66702c930

Change-Id: Iaa8dde8ae93cf895001505e84907dfa60b9079f1

1  2 
res/values/strings.xml

Simple merge