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

Merge "Remove core-junit from API 26 and above" am: 5db2e2633a am: 1354be504d
am: 2b4d329cc1

Change-Id: I8321c2160bf4877e1e9ded54e4829f97c0283712