tree f9f529d6791f5eb2b8c1159979483828ce527d19
parent 2f9b0343452eef9b4508e1e82224ca91ba9dcf42
parent 6ce1b13b76004d63f31379d560e6e327c5e12382
author Andreas Gampe <agampe@google.com> 1418137433 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418137433 +0000

am 6ce1b13b: Merge "Conn_init: Fix unused variable"

* commit '6ce1b13b76004d63f31379d560e6e327c5e12382':
  Conn_init: Fix unused variable