tree 3a6db5c77be3d8180a79ba71f07db6c02cd5fca8
parent 1a8355695fba3066847bf2071bd2eeace5a19b09
parent 14abea3a56f61bdfb734eb04f660d2a4b040127b
author Jiyong Park <jiyong@google.com> 1517967059 +0000
committer android-build-merger <android-build-merger@google.com> 1517967059 +0000

Merge "Build junit with core_current" am: b52b6b012d am: 697eeee7d5
am: 14abea3a56

Change-Id: I15a1c84fd41e11ac2e5b5f43907d3ad0c881007f