OSDN Git Service

resolve merge conflicts of 7f7092c to nyc-mr1-dev
authorJason Monk <jmonk@google.com>
Wed, 8 Jun 2016 20:19:35 +0000 (16:19 -0400)
committerJason Monk <jmonk@google.com>
Wed, 8 Jun 2016 20:19:35 +0000 (16:19 -0400)
commitaaaa236cec53f42963007c46b5d119ce9c6b03c8
tree5d532ee3490dcce9016c127e7a5eae9e21179356
parentd4e31320c1a607e37ace95a77ef012c362dd1004
parent7f7092c70512b24c1b640a8a039e89112ec31e12
resolve merge conflicts of 7f7092c to nyc-mr1-dev

Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
AndroidManifest.xml
res/values/strings.xml
res/xml/device_info_settings.xml
src/com/android/settings/Settings.java
src/com/android/settings/SettingsActivity.java