OSDN Git Service

Resolved conflicts for merge of 67e72aa4 to master
authorTorne (Richard Coles) <torne@google.com>
Tue, 15 Oct 2013 12:37:35 +0000 (13:37 +0100)
committerTorne (Richard Coles) <torne@google.com>
Tue, 15 Oct 2013 12:37:35 +0000 (13:37 +0100)
commitdeb0a156bb20e8bdc2ceba433dfae5adb019f321
tree5efc079fb5e65b99fd5c97e89cb9eca303baafe3
parent9e9d6cd33ffcb223d14f4af04b90ae6a5709a137
parent67e72aa49e39a488b5fdc8972e21fb4ebe79e161
Resolved conflicts for merge of 67e72aa4 to master

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