am 2b51fcb9: Merge "NFC: broadcast intent constants for adapter state change" into gingerbread

Merge commit '2b51fcb9ac80c7c42be8f53763773414ba9ca4fa' into gingerbread-plus-aosp

* commit '2b51fcb9ac80c7c42be8f53763773414ba9ca4fa':
  NFC: broadcast intent constants for adapter state change
tree: ccc2e69bb92259cb595ebc0359809599dcc39cbe
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE