tree ee67001a956198213f07f4475ff9e810a9d7f14f
parent 8e5a97710ca17d7467a50619e672536313cfaf1c
parent 3e0936d1f87d2764390bcb4d80bec1e12c6a3767
author Scott Kennedy <skennedy@google.com> 1384454495 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384454495 -0800

am fdad3f16: am 5e3d1fa1: am 3e8176df: Don\'t show the alternates dialog for GAL contacts

* commit 'fdad3f160ed8c0de91b385df5d1eb8965e6be2a7':
  Don't show the alternates dialog for GAL contacts