tree 3a6db5c77be3d8180a79ba71f07db6c02cd5fca8
parent 6f3aa138173a426316e699220b8565555f241af2
parent 697eeee7d52c52acdce93b71cdbd62199f5eafc9
author Jiyong Park <jiyong@google.com> 1517960761 +0000
committer android-build-merger <android-build-merger@google.com> 1517960761 +0000

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

Change-Id: I04fb41ecaceb05af551bb5a2d60a2a4cf7132855