OSDN Git Service

am 90dad640: am 8bce7c37: Merge "UI compliance for WifiSettings" into jb-mr2-dev
authorMaggie Benthall <mbenthall@google.com>
Wed, 24 Apr 2013 20:03:19 +0000 (13:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Apr 2013 20:03:19 +0000 (13:03 -0700)
commitea1690ea5ec449c290928124f346132e04ebf0aa
treeb020ad4a83aaca9bec1732fc1e62ac40fce9cb23
parentaf6202f27031a2e634f05cad26d82d626d2a1d67
parent90dad6404c2810f9f4110ecec94000c84d7e456d
am 90dad640: am 8bce7c37: Merge "UI compliance for WifiSettings" into jb-mr2-dev

* commit '90dad6404c2810f9f4110ecec94000c84d7e456d':
  UI compliance for WifiSettings
res/values/strings.xml