)]}' { "commit": "b6ea621b4708e0ad4415b49d3585ef5cac77469c", "tree": "032c9bb118bcdd56f46d1333db6ee6b54abd2ee5", "parents": [ "7b045a4a41b16e426aa1ad3dcbb9b41f4bfc409a", "41b9dc407ed4157b7e5b2caab871ff22d51a549b" ], "author": { "name": "David \u0027Digit\u0027 Turner", "email": "digit@google.com", "time": "Tue Oct 18 19:00:22 2016 +0200" }, "committer": { "name": "David \u0027Digit\u0027 Turner", "email": "digit@google.com", "time": "Wed Oct 19 10:17:21 2016 +0200" }, "message": "Rebase qemu-android over upstream QEMU v2.7.0\n\nThis patch rebases the qemu-android source base\non top of a much more recent version of upstream\nQEMU (previous version was 2.2.0).\n\nIt was created by doing the following:\n\n- Look at the history of all changes in qemu-android\n over v2.2.0, and \"clean it up\" into a list of\n small opiniated patches to do one of the following:\n\n - port back fixes from upstream that happened\n after v2.2.0\n\n - provide bug-fixes / improvements required\n by the Android emulator (but not directly\n related for Android emulation).\n\n - add Android-specific features.\n\n- Rebase the \"clean patches stack\" on top of\n QEMU v2.7.0 (i.e. 1dc33ed90bf). The end process\n ended up being one of this patch\u0027s parents,\n i.e. 41b9dc407\n\n- Merge the latter with the \u0027theirs\u0027 strategy\n (favoring the new sources over the current ones).\n\n- Manually adjust any required changes by\n comparing the state of both trees. Fix any\n remaining conflicts.\n\nNOTE: This updates the git submodule for the dtc/\n sub-directory, you may need to run the\n following command in your work directory\n after pulling this change:\n\n git submodule update dtc\n\nChange-Id: I783ab762a696c8345c37e5ce2c966349f3710073\n", "tree_diff": [] }