tree 86d3807fd3760fab7b5c16b064eb125f8d4175cf
parent e91c9c81846505df1ad160727a703139d5aa07ae
parent dae3fd4affe895e1798e3afc44477d8b1ec54804
author David 'Digit' Turner <digit@google.com> 1480436821 +0100
committer David 'Digit' Turner <digit@google.com> 1480503372 +0100

Merge external/qemu-android into external/qemu

Now that nearly everything was moved under android/, it is
possible to merge the QEMU2 source tree into external/qemu.

The end result is a git repository that contains both QEMU1
and QEMU2 sources at the same time, simplifying development
(i.e. code-reviews, branch and release management, bisecting).

This was done by doing the following:

1) Perform the merge:

   git remote add \
       aosp-qemu-android https://android.googlesource.com/platform/external/qemu-android

   git fetch aosp-qemu-android
   git merge aosp-qemu-android/emu-master-dev -X ours

2) Update documentation and build scripts

   Replacing external/qemu-android/ with external/qemu/
   and /../qemu-android with . whenever needed.

3) Update android/docs/DEVELOPMENT.TXT to better describe the
   directories containing the emulator sources.

Change-Id: Ifddf7ac5e46218efbb42f7ea1c553f9595652a19