tree 8e9b73fe8c13d853ef89a5de5c5838111d025463
parent 8141039bf7c949e9908ae400c29559178e30871b
parent 43396b8773f8b6bf7530c0e501e4e21272a1b612
author Andrew Lee <anwlee@google.com> 1417639463 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417639463 +0000

am 43396b87: am 1bf97f52: Merge "Don\'t show add if there is an outgoing call." into lmp-mr1-dev

* commit '43396b8773f8b6bf7530c0e501e4e21272a1b612':
  Don't show add if there is an outgoing call.