tree d4022a6507143f08283e4a0e87ff9192ddb8575a
parent 582c67590f5c2814bd0b64381ef587fb966d3a9f
parent 1c546fe0af9b77fae9e07ad139360efb27a46237
author Wink Saville <wink@google.com> 1342559333 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342559333 -0700

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

* commit '1c546fe0af9b77fae9e07ad139360efb27a46237':
  Use telephony-common - DO NOT MERGE