tree 0e08c87b3316fb4a0c3c77dd00f0ecfb9d9eb567
parent 89fb1b9fdc7f5c48d4983fad62af62c1b780e428
parent e79665e3657171f55a979ca558ebe3c3dbf108d2
author Paul Duffin <paulduffin@google.com> 1481116984 +0000
committer android-build-merger <android-build-merger@google.com> 1481116984 +0000

Merge "Replace core-junit with junit" am: 2b483ecb8b am: 6423c63a15 am: b73f9e1871
am: e79665e365

Change-Id: I6baab0fb7f8918214d2564297fe931769396d9bb