tree 75b2a1bd34da2b08c48f34599ad34b4e90fc4b5a
parent 73a3754c6766b7220878983317b3d56ce7fc6e58
parent e20891e4ccdbedc5af9cd94b2fc368dce43c96fb
author Santos Cordon <santoscordon@google.com> 1362618890 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362618890 +0000

am e20891e4: Merge "Additional context for sip address types." into jb-mr2-dev

* commit 'e20891e4ccdbedc5af9cd94b2fc368dce43c96fb':
  Additional context for sip address types.