am a6780991: am e53c9a81: am 6bcd99c2: Merge change I1b6d202b into eclair

Merge commit 'a67809918f6c212630da0b359628d0e8722b091f'

* commit 'a67809918f6c212630da0b359628d0e8722b091f':
  Move photo querying off main thread.