am 0e6242f7: am 40c2b7cb: Merge "Add missing lock in SocketListener." into gingerbread

Merge commit '0e6242f7e2c1181d486ae8f86592619738574dd3'

* commit '0e6242f7e2c1181d486ae8f86592619738574dd3':
  Add missing lock in SocketListener.