am fb52c474: am a26cf301: Merge "Enforce 1-1 relationship between context and...
am fb52c474: am a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
* commit 'fb52c474':
Enforce 1-1 relationship between context and NfcAdapterExtras.