tree 277e3eae8753f1dbda5522707069ad949dd7fcf0
parent fc96d4b548db2e6d66db7e4def67dd37fc006827
parent 407e763d3c216bfe19582e98e4b0fc010969d6eb
author Kenny Root <kroot@google.com> 1398879078 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398879078 +0000

am 407e763d: am 5e9a9feb: am d5ecf3ee: am 3913087a: am b9d9f023: am c161d679: am 1b41a7a9: am 2aa67439: Merge "Fix ClonedSecureRandomTest on single core devices" into jb-dev

* commit '407e763d3c216bfe19582e98e4b0fc010969d6eb':
  Fix ClonedSecureRandomTest on single core devices