am 1e563f91: am 968735e5: Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread

Merge commit '1e563f91183d95f5ad2461b7bca864e8f223ef71'

* commit '1e563f91183d95f5ad2461b7bca864e8f223ef71':
  Fixing the NPE in SipPhone
tree: 247e2d025033d62db7eece1eb089109dd36e382f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE