am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1

* commit '043a8b149dc31d3e3242ccf0cadc580702c99552':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
tree: c0412be0030c0e0248247c27f5a59ae89c7a8d04
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE