tree 23aff9cb016be551cefb97f4f054b851a3684db1
parent 0340371297887290d7593d7c346e422a4c9ecd1a
parent 72ce892dd99e8340fceea8ebff41c4fd38d520bd
author Nick Pelly <npelly@google.com> 1287003540 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1287003540 -0700

Merge "Move NFC setting lower down the Setting's list." into gingerbread