tree f302ac7fc46a9468719c47f760abba8cbcca5cb1
parent 0c8c1d351beaae841102ee85c78eb6205e37a16b
parent 596e25cb122835448aee4c4e91b4224d673007d4
author Christine Chen <christinech@google.com> 1380221469 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380221469 -0700

am 596e25cb: am 36df59e0: Merge "Add no favorite card to the Dialer" into klp-dev

* commit '596e25cb122835448aee4c4e91b4224d673007d4':
  Add no favorite card to the Dialer