tree 2e5cb4c26121ba2658ab62fe4cf6bdbe4263dbe2
parent f29ac10f0f3649c16a6e44bac961401cd3874fd4
parent 0226eb00cecf82b53e29758c04cd1b39015d2909
author Jean-Baptiste Queru <jbq@google.com> 1346957513 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346957513 -0700

am f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"

* commit 'f66603e109d439e3a537cd3804706609ce86970e':
  Make SimpleSessionDescription locale safe