am 2d51bcf4: merge from open-source master
am 8f84adfa: am d669a2b2: bug #2694518: remove Google Voice private API in MMS app per discussion with team.
am b451a522: am 9653d43d: bug #2641505: when the SIM card doesn\'t have the MSISDN, sending MMS fails.
Merge "get this synchronization right"
Fix ANR

Move debug function of writing out hprof data under a debug flag.
Bug 2683746.

Change-Id: I6a313484b66801913be1236f1e7eae5fe15b3c91
Merge commit '574c33bcccbb888d8126d444da330dc57ea7fc2b' into oxygen_1005

* commit '574c33bcccbb888d8126d444da330dc57ea7fc2b':
  Fix ANR