OSDN Git Service

Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4 am: 6fc5051613
authorRebecca Silberstein <silberst@google.com>
Fri, 14 Apr 2017 04:25:57 +0000 (04:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 04:25:57 +0000 (04:25 +0000)
commit01d3ad5cf2e9d475418d111cf124b9c8ecd2b7ba
tree0493cdcbb0c2d53a67f9594bef3db114c6f33025
parent71a840befaf9862a9a618f36a1f245645ae6b4da
parent2f7a16961841ad8a429087a2ffc1eabfd27d9437
Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4 am: 6fc5051613
am: 2f7a169618

Change-Id: Id0a6bc3452b909ac22704ab76b2811259f94147f
core/res/res/values/strings.xml
core/res/res/values/symbols.xml