Commit 2070e456 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski
Browse files

Merge android/kernel/common/android-4.14 into cuttlefish-4.14 

Conflicts:
  arch/x86/configs/x86_64_cuttlefish_defconfig

Change-Id: Idecc7978f48ab0bd4feaab4d947b5903beac3c0d
parents 2074883d 815e34f8
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