tree cc698dc16c9e90fb86f076e65da1dc817439fb24
parent 1d2f4506806838aee4720d94edd31b85b87462c5
parent 2121ec9bca3507c7c3df6fb4fb1d553990adc05b
author Jesse Wilson <jessewilson@google.com> 1285091363 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285091363 -0700

am 2121ec9b: am 8217eac0: Merge "Fix double-checked locking bug in LocalSocket." into gingerbread

Merge commit '2121ec9bca3507c7c3df6fb4fb1d553990adc05b'

* commit '2121ec9bca3507c7c3df6fb4fb1d553990adc05b':
  Fix double-checked locking bug in LocalSocket.