tree a5483f5aeabbfad1cc005e5b7c0ff4c102d2938b
parent 83c2891d2848434857076237aa5db12b786e18fb
parent a2c97865af14be4752673935634ed3a228101825
author Nicholas Sauer <nicksauer@google.com> 1391792666 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391792666 -0800

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 'a2c97865af14be4752673935634ed3a228101825':
  Revert "DO NOT MERGE Add test to check for duplicate random output"