tree 89dbc0be8f720fa1a571ae1b76db867cb5000f85
parent 564e016e300d093a54482f7835eda2e0e697f30d
parent 7be2b01f3c32211ba1c8f152c106c1516684f687
author SzuWei Lin <szuweilin@google.com> 1568782382 -0700
committer android-build-merger <android-build-merger@google.com> 1568782382 -0700

Merge "Revise aosp_x86_arm to inherit from mainline_system directly"
am: 7be2b01f3c

Change-Id: I21626f8bfe8705a4486edf19ff3494dbbbf6db83