tree 3b3a171629f16e056a58ccc0b43d7c94529f277e
parent d8b1783e2fe73101807c474f770dd1781bcc3777
parent 308b825102e7101d6ca075d7ba10419384edf722
author Fyodor Kupolov <fkupolov@google.com> 1497657741 +0000
committer android-build-merger <android-build-merger@google.com> 1497657741 +0000

Merge "[DO NOT MERGE] Build CTS tests as multilib apks" into marshmallow-cts-dev
am: 308b825102  -s ours

Change-Id: I9278463bcb8f83f965e3b45931bd2e5360a0826e