OSDN Git Service

Merge "Revert "Add Emergency Info preference to user settings""
authorDaniel Sandler <dsandler@android.com>
Thu, 28 Jan 2016 14:24:14 +0000 (14:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 28 Jan 2016 14:24:14 +0000 (14:24 +0000)
commitba9b20dae05ac80281227edf4584d365506684b3
tree8d6271d081a934c22cdaaf314a13c3ed05636233
parentaf1f84a0cd575d49dffb36dec32cfaa3415ee2f7
parent0def4c45b2199c26ead8a38678ca05c4a37b5b1e
Merge "Revert "Add Emergency Info preference to user settings""
res/values/strings.xml
src/com/android/settings/users/UserSettings.java