Merge change 2090

* changes:
  Fix bug #1863517: use the new signature for data message token in SubscribedFeedsIntentService.
tree: abdde446880bebc1cc4c991c67b194ee395963b2
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE