OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d5e320 083310d)
am 083310d3: Update NFC settings description, and fix polarity.
authorNick Pelly <npelly@google.com>
Wed, 13 Oct 2010 04:27:48 +0000 (21:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Oct 2010 04:27:48 +0000 (21:27 -0700)
Merge commit '083310d316059c6592120c32e1c0b736e85b83c0' into gingerbread-plus-aosp

* commit '083310d316059c6592120c32e1c0b736e85b83c0':
  Update NFC settings description, and fix polarity.

1  2 
res/values/strings.xml patch | diff1 | diff2 | blob | history

diff --cc res/values/strings.xml
Simple merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help