From: Xin Li Date: Mon, 10 Dec 2018 18:54:04 +0000 (-0800) Subject: [automerger skipped] Merge "DO NOT MERGE" am: c5db7f8f22 -s ours X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-libffi.git;a=commitdiff_plain;h=5c89000180637f4df9e85bba0c804ee824c470bc [automerger skipped] Merge "DO NOT MERGE" am: c5db7f8f22 -s ours am: afa87d5e95 -s ours Change-Id: I4c4a9d31347325a7744e1bd69832d901c6cefe58 --- 5c89000180637f4df9e85bba0c804ee824c470bc