Commit 65c6340d authored by Rom Lemarchand's avatar Rom Lemarchand Committed by Android Git Automerger
Browse files

am 1b7abd2c: resolved conflicts for merge of f7c53bd0 to stage-aosp-master 

* commit '1b7abd2c':
  Check that androidboot.hardware is set on the kernel command line
parents 8f6d2901 1b7abd2c
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