OSDN Git Service

Merge "Show Error dialog when WPS is interrupted"
authorRyusuke Sawa <ryusuke.x.sawa@sonymobile.com>
Thu, 27 Jul 2017 18:21:19 +0000 (18:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Jul 2017 18:21:19 +0000 (18:21 +0000)
am: fd7dec5d4a

Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3

1  2 
res/values/strings.xml

Simple merge