tree cb290e2697aa399cab0239c23b5619d152f00865
parent c67fd14fd197cb479ce9a48b11116f91b5f85f94
parent 1f42401f3543e908bd576764e7e6d5dc1a17f454
author David Sehr <sehr@google.com> 1518126718 +0000
committer android-build-merger <android-build-merger@google.com> 1518126718 +0000

Merge "Remove dependency on -no_art variant" am: 2ccde89153 am: 1f5228709c
am: 1f42401f35

Change-Id: I58e8ff0d06708d42ff2dbfe4cb85820dfb4c05d3