am c06ff6ba: Merge "Telephony: add support for additional information"
Wink Saville [Thu, 3 Jan 2013 01:07:16 +0000 (17:07 -0800)]
* commit 'c06ff6babf825f7215b0c17ddf4edc12a7346698':
  Telephony: add support for additional information


Trivial merge