OSDN Git Service

am b3c4365d: am cd99332f: Merge "Update settings app for new NFC API." into gingerbread
authorNick Pelly <npelly@google.com>
Fri, 15 Oct 2010 02:29:44 +0000 (19:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Oct 2010 02:29:44 +0000 (19:29 -0700)
commit2f54a66abd8b6f4ccb7d7591804d88912049c84c
tree1898b8362d3fa8561b65db41ed2f7699f9b327f3
parent9d36ab531bd455e1ccbaedc45e2f5af0131f6eaa
parentb3c4365d10047eae367b529d98d5a90d052f6393
am b3c4365d: am cd99332f: Merge "Update settings app for new NFC API." into gingerbread

Merge commit 'b3c4365d10047eae367b529d98d5a90d052f6393'

* commit 'b3c4365d10047eae367b529d98d5a90d052f6393':
  Update settings app for new NFC API.