tree d806b9416ac3fd63d8570cf6f6f6e4c7ad7770b9
parent ddeb9eaa1e6fc4b920b95cd6269d2a79c15647e5
parent b2c3473d35d2fb8ea7bec9de290f7add979e5474
author Elliott Hughes <enh@google.com> 1428033349 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428033349 +0000

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

* commit 'b2c3473d35d2fb8ea7bec9de290f7add979e5474':
  Just use snprintf for android_get_control_socket.