[automerger skipped] Retire device/generic/qemu am: d95a67ed72 am: 3e8225d3b0 -s ours am: 055cc0b1fa -s ours am: 5a36b9b2e5 -s ours am: b7928292dd -s ours

am skip reason: Change-Id Iab852783c2728f5757a4a1e051119fd50f389df6 with SHA-1 12b48753e5 is in history

Change-Id: Ib77547db58bad38fb1ab2186b31b49130ee9e1da
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.