am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread

* commit 'e69f4267e1cdf5353fffa99a0d49f4c9069415b9':
  NfcAdapterExtras: reset singleton state if initialization fails.
tree: 3df13b324209e6ab022e8508522255c975507533
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE