OSDN Git Service

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

Change-Id: If350524f65a14de2f7c95919f85657a5e2476469


Trivial merge