OSDN Git Service

Merge "Revert "Dialog for emergency info"" into nyc-dev
authorMaria Garcia Puyol <mariagpuyol@google.com>
Fri, 18 Mar 2016 15:06:02 +0000 (15:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 18 Mar 2016 15:06:02 +0000 (15:06 +0000)
commitc35b08b4b3de8daebbc6974715dbc4a0d4a91c1e
treeac87d5478f8c849710805aacf746b0d08746f11b
parent47a9d4f70c21cb8b19af5699fb9522668dc0fb6a
parentda497f26d747038b53caf71a05c72ebf591bbdf0
Merge "Revert "Dialog for emergency info"" into nyc-dev
res/values/strings.xml
src/com/android/settings/users/UserSettings.java