tree 2f7e857720df0fffc2d6140c5086ebf259df4d87
parent fe633bb897a9ed742ff3eec598759ef2591e2249
parent 2db72dd0cdb59550dc030ff875e5e6672cd1bf56
author Nicholas Sauer <nicksauer@google.com> 1391793051 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391793051 -0800

am 2db72dd0: am a2c97865: am 5f7feeff: am ecdf0299: (-s ours) am 5cbd4601: Merge "Revert "DO NOT MERGE Add test to check for duplicate random output"" into jb-dev

* commit '2db72dd0cdb59550dc030ff875e5e6672cd1bf56':
  Revert "DO NOT MERGE Add test to check for duplicate random output"