tree 341c67151d389263e3760afb73d16d76d861a83a
parent 57b7573210750ead5c6a5d6a8ebd41d8e61636ec
parent 0c7532ff8562aa3bc2ba29122fa173151e2bb169
author John Reck <jreck@google.com> 1430761705 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430761705 +0000

am 0c7532ff: am e678b41c: Merge "Fix setName use-after-free" into mnc-dev

* commit '0c7532ff8562aa3bc2ba29122fa173151e2bb169':
  Fix setName use-after-free