OSDN Git Service

Merge "Gateway whitelist AdvancedConnectedDeviceDashboardFragment"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 1 Mar 2018 22:33:30 +0000 (22:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 1 Mar 2018 22:33:30 +0000 (22:33 +0000)
commit63c34f1e0c25c0657725fb3f4e223303fbeee4b0
tree13348c4dc4a1b75a6fcd362ad88e2e5bdb46539d
parent3acb158d01c4a658651ad1a60e2926b41a731e48
parent747f0e14ef9dad0130d633462b241c8134c02ad1
Merge "Gateway whitelist AdvancedConnectedDeviceDashboardFragment"
res/values/strings.xml
src/com/android/settings/Settings.java