tree a27d4b4fd85533c1849d79a88588b69cb129052a
parent 06c60d8dab3ab7f533a50b4fdede1418a1e21486
parent ad4f3ea753b6dc43b1a82110c9fdf505966e74fb
author Makoto Onuki <omakoto@google.com> 1379033048 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379033048 +0000

Merge "Show "Calling via google voice" only in the DIALING state." into klp-dev