tree 5b3977a93257948a6efd5788b338f80369d9042a
parent edf93764f09357f6062eee2e4da8da925247834a
parent a001f7ae7fde0418a6f8e455f88a2d7dc3c392ce
author Tyler Gunn <tgunn@google.com> 1440091694 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440091694 +0000

am a001f7ae: Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev

* commit 'a001f7ae7fde0418a6f8e455f88a2d7dc3c392ce':
  Add carrier config variable to hide merge call button