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

Merge commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3' into gingerbread-plus-aosp

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