Commit c04bd159 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android Git Automerger
Browse files

am 394ebe47: resolved conflicts for merge of 323fed21 to klp-dev 

* commit '394ebe47':
  CTS tests for major:minor of /dev/random and /dev/urandom.
parents 71ba6555 394ebe47
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment