tree d806b9416ac3fd63d8570cf6f6f6e4c7ad7770b9
parent 60b6f675b74b17255b9a25b2b616967402fd053f
parent 38b92f3f9d00a763df3c099a934b9071edf373cd
author Elliott Hughes <enh@google.com> 1428032730 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428032730 +0000

am 70df6f85: Merge "Just use snprintf for android_get_control_socket."

* commit '70df6f85fe8164010be3e4e1cf87e1dd31fb7614':
  Just use snprintf for android_get_control_socket.