tree e90fbe653870d4e09c3a940f2b3156055b9179c9
parent 02bb500a3f96576aff8fd8546a54127706548159
parent 9e84fb4b5c54ee5e97a044026dab39c7c1a452b2
author Paul Duffin <paulduffin@google.com> 1481542564 +0000
committer android-build-merger <android-build-merger@google.com> 1481542564 +0000

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

Change-Id: Ie4d233352bb880864426cb56c4e7edb30dd6ec66