Merge changes I620aacf3,Ie5fe2fc1,I41f98fe2

* changes:
  Adding Future method for DialerPhoneNumberUtil
  Show on hold in management screen for conference call.
  Allow for multi-line transcription error messages
tree: 97dfa798809e8d909538eeaac34b4dba8725059d
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE