Commit 5849febc 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:... 

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

Change-Id: I6ff20178215895f46b1eb0afec21a8fc55701f00
parents 25867857 fc265971
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