tree 3569cd4f77ade93ad673e71ab766720bdb734bfe
parent e9be5d908d32d67db9968a9ff12c37b579149bf7
parent b5f056068d0eb2e3b603e950de73262d6e81d85d
author Paul Duffin <paulduffin@google.com> 1481728611 +0000
committer android-build-merger <android-build-merger@google.com> 1481728611 +0000

Merge "Copy core-junit files into legacy-test." am: 69e363f506 am: 884d3ca53b
am: b5f056068d

Change-Id: Ib5f9f0744dbb610210394264d088df0db8b05988