tree 35480f8e3f987bd036eaf941cc4bee9065c82bb4
parent c63610777100d8ce17a0c2b3db788fe8b0913171
parent 4345912dc8f2ca0abf90f4f671a5fb1125cfa7e8
author Jason Monk <jmonk@google.com> 1436907872 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436907872 +0000

am 4345912d: am b9b50eff: am a7542155: am 2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev

* commit '4345912dc8f2ca0abf90f4f671a5fb1125cfa7e8':
  Move wifi accessibility strings to SettingsLib