tree bc2f55d515f28a12564be11df8e8a114e3a18792
parent 56c0364973dccf3e1e7de956090e98bf3b1dc8d4
parent aa6af71cae85ab2679f1cb3747245a32e9224138
author Jay Shrauner <shrauner@google.com> 1400084754 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400084754 +0000

am 7547df61: am 40ce41bf: Remove Google Voice gateway number

* commit '7547df61d141e4cca3c73360e9633b917e5a9004':