tree a4680ee8dc8ccc238fb15614939b5cceb601a199
parent 4a3b7fa1669e74737e0537ed088be4702047af6d
parent bc732bf45b96ff580a2b3fa074401b389aba9a9c
author Anton Hansson <hansson@google.com> 1550896607 -0800
committer android-build-merger <android-build-merger@google.com> 1550896607 -0800

Merge "Add support for *_CPU_VARIANT_RUNTIME flags" am: 4208c81ab9
am: bc732bf45b

Change-Id: If5adc4e9d24575bfadcdc30dacaa2a26afd34326