tree bbbba8cb16feb56d76e1c0742a40df11ebca1104
parent f691758c787aa63e72460cfc07bd983eea03dee0
parent 37e4a4fdf90a231548aab66148070889c05733d1
author Wink Saville <wink@google.com> 1342553797 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342553797 -0700

am 37e4a4fd: (-s ours) Use telephony-common - DO NOT MERGE

* commit '37e4a4fdf90a231548aab66148070889c05733d1':
  Use telephony-common - DO NOT MERGE