Commit fc265971 authored by Isaac Chen's avatar Isaac Chen Committed by android-build-merger
Browse files

[automerger skipped] Merge "emulator: 64-bit kernel for 32-bit arm image" am: 7fd8d258 

am: b9e5e5f0  -s ours

Change-Id: Ibe718d29e45540463970e1bde7006f5a53cde89b
parents 89695f22 b9e5e5f0
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