tree eadd28546f4ad1c872f56beadc2990eb5e012212
parent 5ebbb19f8ff4fc08179b459c5af6b19acb936fde
parent 82a75cd20166e940eb36e9b0e8a0f2281e5b40be
author bohu <bohu@google.com> 1519884500 +0000
committer android-build-merger <android-build-merger@google.com> 1519884500 +0000

Merge "emulator: use 4.4 kernel for x86 and x86_64" am: 01670eb141 am: db14a186ae
am: 82a75cd201

Change-Id: Iec85fd60c22ea79c999d288f94e90099472f0c53