Commit 2dc6c6a1 authored by Rom Lemarchand's avatar Rom Lemarchand Committed by Android Git Automerger
Browse files

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

* commit '65c6340d':
  Check that androidboot.hardware is set on the kernel command line
parents 7aea52de 65c6340d
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