tree f357b4afd514de049204ef0ab3998e89bf3ff288
parent 1ebb243d1ad7b82887b6b09c972f57f4c820a9f1
parent 5a095ef28716b54f86d9c1727b9a2493ba775255
author Geremy Condra <gcondra@google.com> 1338401493 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338401493 -0700

am 5a095ef2: am 03539a36: Merge "Ensure that the port number and TXID are properly randomized." into jb-dev

* commit '5a095ef28716b54f86d9c1727b9a2493ba775255':
  Ensure that the port number and TXID are properly randomized.