OSDN Git Service

resolved conflicts for e0d175ed to master
authorJason Monk <jmonk@google.com>
Wed, 23 Sep 2015 22:55:44 +0000 (18:55 -0400)
committerJason Monk <jmonk@google.com>
Wed, 23 Sep 2015 22:55:44 +0000 (18:55 -0400)
commit7eda07bc5f69df9be080449a91260491c3492e99
tree86d940aebebe85653891ffa79894425493ec30c1
parent4148f17616173a0bb475ed3b09ed90fc17540cc6
parente0d175edc68ba201902158c1377100200f018790
resolved conflicts for e0d175ed to master

Change-Id: Ia9f6e2f5af2ee4e5b944a80407bfedf7f9b30a1b
res/values/strings.xml
res/xml/development_prefs.xml
res/xml/display_settings.xml
src/com/android/settings/DevelopmentSettings.java
src/com/android/settings/DisplaySettings.java