OSDN Git Service

Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5
authorSanket Agarwal <sanketa@google.com>
Mon, 31 Oct 2016 19:25:34 +0000 (19:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 31 Oct 2016 19:25:34 +0000 (19:25 +0000)
commit9e33f453a3af6700c20f1503aa7714ef91fbbea1
treea94d64001b2f7b13e874d012e826fb56b9ebebf5
parent635d52887704194420f6d1eb5cf6814d731ed1b0
parent50cc13cc18935745968987ca20e62cbffba9cb95
Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5
am: 50cc13cc18

Change-Id: I6725098623dba530db325f6b12d5193f9f2629e7
core/java/android/provider/Settings.java
core/res/res/values/config.xml
core/res/res/values/symbols.xml