Merge change 10027

* changes:
  Fixed Issue 2682: ContentProvider query() SDK docs deprecated
tree: 47dd8bb9cbb6c0d73bad5d58209cb1d4269316b3
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE