tree 1393a3b6346ed1f6678218ac73dfe45981959ef5
parent e244b7f8628cf5373e2dc3c2934e701e4b474583
parent 7eb6be50ed0a6e94ef50eb53b98450117be885e6
author Jay Shrauner <shrauner@google.com> 1416941781 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416941781 +0000

am cb04cc89: am 34b4406d: am a44049e1: Fix NPE in getCallProviderLabel

* commit 'cb04cc89b006406ed7118a89a69c5fed58be49c1':
  Fix NPE in getCallProviderLabel