Merge commit '7888486d1c930301535069bd90bb0bf3525b2bb5' into gingerbread-plus-aosp * commit '7888486d1c930301535069bd90bb0bf3525b2bb5': Add subaddress to SMS fingerprint calculation.
Merge commit '7888486d1c930301535069bd90bb0bf3525b2bb5' into gingerbread-plus-aosp * commit '7888486d1c930301535069bd90bb0bf3525b2bb5': Add subaddress to SMS fingerprint calculation.