tree 2bda3a0ca2f9da6aca643235f2b9b7b42bf25f11
parent 117c2b3e7601cbe374d90cfb8704731fe397aecd
parent b9d9f0230ce34cd499ab6263180709678f5d2365
author Kenny Root <kroot@google.com> 1398877768 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398877768 +0000

am b9d9f023: am c161d679: am 1b41a7a9: am 2aa67439: Merge "Fix ClonedSecureRandomTest on single core devices" into jb-dev

* commit 'b9d9f0230ce34cd499ab6263180709678f5d2365':
  Fix ClonedSecureRandomTest on single core devices