tree 6a2ba9bca64bdaae7066a70e706760206510af7c
parent 9eab3d8fec8e031ead1c1f09ef40e0998a228d10
parent bf7c617b88876d8255590de1c855a6edeaa7dad2
author Wink Saville <wink@google.com> 1342054330 -0700
committer Wink Saville <wink@google.com> 1342054330 -0700

Merge commit 'bf7c617b' into mit

* commit 'bf7c617b':
  Use telephony-common and mms-common