OSDN Git Service

resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp
authorRuchi Kandoi <kandoiruchi@google.com>
Sat, 11 Jun 2016 05:04:52 +0000 (22:04 -0700)
committerRuchi Kandoi <kandoiruchi@google.com>
Sat, 11 Jun 2016 05:04:52 +0000 (22:04 -0700)
commitf8c135a9866d94346fc1bcdc4421f2b234112656
treee0a87459ff3aa8f13d062077875d55fcf80d878c
parent099609af9748e6d78a364bfee668d1371621356f
parent9e28f9a7f7e7bd70962b4843b07086eac9d7bb93
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp

Change-Id: If75736f8e36e2a8e13fe9740f89f632ee6bedd49
res/xml/development_prefs.xml
src/com/android/settings/DevelopmentSettings.java