tree 496f1879f7a9a9f10ef5841d542b1f2b794e77c9
parent 917cf0fdd6d45ce901e63c54eb100920daeb89bf
parent 6ca289deea609a0b86dfee24cc30213268600cac
author Wink Saville <wink@google.com> 1342553812 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342553812 -0700

am 6ca289de: (-s ours) Use telephony-common - DO NOT MERGE

* commit '6ca289deea609a0b86dfee24cc30213268600cac':
  Use telephony-common - DO NOT MERGE