OSDN Git Service

resolved conflicts for merge of c2c64a31 to master
authorMark Salyzyn <salyzyn@google.com>
Fri, 13 Jun 2014 21:57:13 +0000 (14:57 -0700)
committerMark Salyzyn <salyzyn@google.com>
Fri, 13 Jun 2014 21:57:13 +0000 (14:57 -0700)
commit6b5bcd213852a3fbff3ec427176862bc9b97e97f
tree3ba2be89131ad4b93ef5d9d5bc7249d75088ea13
parenta6fa002315c58ec4fd779ad27c4dacbcd631d980
parentc2c64a312a0ccec59c13ee0d04b8ffc730b7a3b7
resolved conflicts for merge of c2c64a31 to master

Change-Id: Ica0f138d4bf2cf66b8ba485bf286e062be433d0a
res/values/arrays.xml
res/values/strings.xml
res/xml/development_prefs.xml
src/com/android/settings/DevelopmentSettings.java