tree d1901e38065b2fe23c14cfc0c0e615f9ec542723
parent 411b7d9b5ece9cabd603eb7a868e7f9cabf65aff
parent e0857a580045098a39db6469c2f79d47963eb1cb
author Andrei Stingaceanu <stg@google.com> 1493804891 +0000
committer android-build-merger <android-build-merger@google.com> 1493804891 +0000

Merge "Move text coretests to JUnit (1)" into oc-dev
am: e0857a5800

Change-Id: I295b78a4397bb6409eef1963362b766c0ea78640