Merge commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af' into eclair-mr2-plus-aosp * commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af': Move photo querying off main thread.
Merge commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af' into eclair-mr2-plus-aosp * commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af': Move photo querying off main thread.