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