tree cceecdb899aafd45bbba32cadefb44caffdcebe3
parent 3fea5e0d660275f0fbf6bd43c9dc6d04202c08b5
parent 36f53ef0ebf816faaf363a977a784d491564acd3
author Elliott Hughes <enh@google.com> 1557539579 -0700
committer android-build-merger <android-build-merger@google.com> 1557539579 -0700

Merge "bionic_tests_zipalign: don't explicitly specify no prefix/suffix." am: 235ccfd19b
am: 36f53ef0eb

Change-Id: I30e77313cc602c0537e29df2637f0baad80f6d77