OSDN Git Service

Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics...
authorThe Android Automerger <android-build@android.com>
Thu, 3 Nov 2011 03:58:19 +0000 (20:58 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 3 Nov 2011 03:58:19 +0000 (20:58 -0700)
commit850cb95af3949ca7967deea104844c800f7d4b62
treebf9ce559427358692c44f24b96243f74aa81cbcf
parentae076c958c704628cc60bc897084689670f740d6
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"

This reverts commit 1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to 19d9a3d2846c538502003a81522f6d285b9ff24b.
AndroidManifest.xml