OSDN Git Service

Merge commit '819bbf1e649c2dfe823275cf531c5b4e5aa7cb26' into remote
authorVara Prasad A V S G <vavsg@codeaurora.org>
Wed, 7 Dec 2016 15:16:50 +0000 (20:46 +0530)
committerVara Prasad A V S G <vavsg@codeaurora.org>
Wed, 7 Dec 2016 16:51:35 +0000 (22:21 +0530)
commit651e20d7d1fa76a0f0be7f8ae1edfdfed5e6cb49
tree65e8d873a61da7a7956d8277f410b51e36bb5146
parent3c5d9d2150479376d6c06a37dae8ae63580b74b3
parentf15c62d6c3ce178333c56b47740673fd86af6182
Merge commit '819bbf1e649c2dfe823275cf531c5b4e5aa7cb26' into remote

Conflicts:
res/values/config.xml

Change-Id: I33a1ff8eb9d1a6978dc304cef0d8b0d3be699cb0
res/values/arrays.xml
res/values/config.xml
src/com/android/settings/WirelessSettings.java
src/com/android/settings/accounts/AccountSyncSettings.java