tree 2a812ca8158eb0bf236fca75d16849e6b3f1a57c
parent f7b77c235ea5d4c9cba611d3ea23c63143c150c6
parent 545a49fe37062e3df87556d7f9bbdda7ad9434e0
author Wink Saville <wink@google.com> 1342559329 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342559329 -0700

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

* commit '545a49fe37062e3df87556d7f9bbdda7ad9434e0':
  Use telephony-common - DO NOT MERGE