tree 46d5d3aeb7959b0bb08c4c8234032c8ef0b55881
parent 36ba8b1b4c0822036b4652d3e134979fae89c54d
parent a75421557651d7016124f8ed1fa5c0bab834d121
author Jason Monk <jmonk@google.com> 1436906561 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436906561 +0000

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

* commit 'a75421557651d7016124f8ed1fa5c0bab834d121':
  Move wifi accessibility strings to SettingsLib