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

* commit 'f66603e109d439e3a537cd3804706609ce86970e':
  Make SimpleSessionDescription locale safe
tree: 2e5cb4c26121ba2658ab62fe4cf6bdbe4263dbe2
  1. java/
  2. jni/