OSDN Git Service

Merge "Settings for the screen magnification feature." into jb-mr1-dev
authorSvetoslav Ganov <svetoslavganov@google.com>
Fri, 7 Sep 2012 23:20:36 +0000 (16:20 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 7 Sep 2012 23:20:37 +0000 (16:20 -0700)
commitd4b711e60361a2a05ffa11a4199cceea54d3ea96
tree5481e4698820594f141e30caababc0602928ce8f
parent6c0841412e3ddf03d7b9ad56e398a20f6b6cf3fd
parentdecf36e6a50d81ef0955235da99001e500e7cbe2
Merge "Settings for the screen magnification feature." into jb-mr1-dev
res/values/strings.xml
src/com/android/settings/DevelopmentSettings.java