)]}'
{
  "commit": "b3dcf72e75cd5489b98fe650a0b710327f286fe7",
  "tree": "86d3807fd3760fab7b5c16b064eb125f8d4175cf",
  "parents": [
    "e91c9c81846505df1ad160727a703139d5aa07ae",
    "dae3fd4affe895e1798e3afc44477d8b1ec54804"
  ],
  "author": {
    "name": "David \u0027Digit\u0027 Turner",
    "email": "digit@google.com",
    "time": "Tue Nov 29 17:27:01 2016 +0100"
  },
  "committer": {
    "name": "David \u0027Digit\u0027 Turner",
    "email": "digit@google.com",
    "time": "Wed Nov 30 11:56:12 2016 +0100"
  },
  "message": "Merge external/qemu-android into external/qemu\n\nNow that nearly everything was moved under android/, it is\npossible to merge the QEMU2 source tree into external/qemu.\n\nThe end result is a git repository that contains both QEMU1\nand QEMU2 sources at the same time, simplifying development\n(i.e. code-reviews, branch and release management, bisecting).\n\nThis was done by doing the following:\n\n1) Perform the merge:\n\n   git remote add \\\n       aosp-qemu-android https://android.googlesource.com/platform/external/qemu-android\n\n   git fetch aosp-qemu-android\n   git merge aosp-qemu-android/emu-master-dev -X ours\n\n2) Update documentation and build scripts\n\n   Replacing external/qemu-android/ with external/qemu/\n   and /../qemu-android with . whenever needed.\n\n3) Update android/docs/DEVELOPMENT.TXT to better describe the\n   directories containing the emulator sources.\n\nChange-Id: Ifddf7ac5e46218efbb42f7ea1c553f9595652a19\n",
  "tree_diff": []
}