OSDN Git Service

am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread
authorNick Pelly <npelly@google.com>
Thu, 21 Oct 2010 16:37:55 +0000 (09:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Oct 2010 16:37:55 +0000 (09:37 -0700)
commit26d6e4704a9e514097ad88c04b29a4e8b325344f
tree3b6c5b0a8495c0d5c112aa39486a9bc4c3af2ca8
parent149fec6a899079eba30743e7055834969c138d52
parent781c0aa21ed1e4a38dc3ec1a5facc7be48386571
am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread

Merge commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571' into gingerbread-plus-aosp

* commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571':
  NFC Settings cleanup.