OSDN Git Service

Merge "Add a Developer option of "Disable automatic update"." into nyc-dev
authorTao Bao <tbao@google.com>
Wed, 17 Feb 2016 20:06:51 +0000 (20:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 17 Feb 2016 20:06:52 +0000 (20:06 +0000)
commit28dfd93b1473dcc47189d1cbcda3cf6e94e6c49d
tree614428f909170a65d72a76a42b5fff425116b8d4
parent7b54a8154e4b1926f07f7ac37cf9997efc4134ca
parent45a2c163c3870242ed60b5e025d505c967c2b0cb
Merge "Add a Developer option of "Disable automatic update"." into nyc-dev
res/values/strings.xml
res/xml/development_prefs.xml
src/com/android/settings/DevelopmentSettings.java