am 6bcd99c2: Merge change I1b6d202b into eclair

Merge commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef' into eclair-plus-aosp

* commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef':
  Move photo querying off main thread.
tree: df89b30b491832626dca45d536ad23bf40c43872
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE