OSDN Git Service

Merge "Changed description for system alert window setting" into oc-dev am: 48c2d516de
authorChristine Franks <christyfranks@google.com>
Tue, 4 Apr 2017 17:38:29 +0000 (17:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 17:38:29 +0000 (17:38 +0000)
am: c259cee35f

Change-Id: I38cf663bd966013dacf0d7255bab0e4b434beffc

1  2 
res/values/strings.xml

Simple merge