tree e90fbe653870d4e09c3a940f2b3156055b9179c9
parent 2a0cc45e956566ac232a4889fe16a276490036ef
parent 5db2e2633acadd2aae167693a79af88f8cef6245
author Paul Duffin <paulduffin@google.com> 1481541393 +0000
committer android-build-merger <android-build-merger@google.com> 1481541393 +0000

Merge "Remove core-junit from API 26 and above"
am: 5db2e2633a

Change-Id: I82699c3f6f9b07343a0c870a7ae638f61d2c3bac