Merge change 2229

* changes:
  Add carrier/mcc factors to wifi-channel decision.
tree: b7a3cd2bd1a437237e71598d05b88be3f681c610
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE