OSDN Git Service

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)
commitf4e4319f4162c5dca14a9acc00bb5a2df0e452b3
treebddd2f30a23fccc820f22f37d51e4f67a926ea33
parent0d5e320cdd9cbd76012c0a1aec157e358d05891e
parent083310d316059c6592120c32e1c0b736e85b83c0
am 083310d3: Update NFC settings description, and fix polarity.

Merge commit '083310d316059c6592120c32e1c0b736e85b83c0' into gingerbread-plus-aosp

* commit '083310d316059c6592120c32e1c0b736e85b83c0':
  Update NFC settings description, and fix polarity.
res/values/strings.xml