am 0e4895c4: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner" into stage-aosp-master
* commit '0e4895c43d8a194a664b25d52abf6842e9c7335e': DO NOT MERGE: fix package for AndroidJUnitRunner
This commit is contained in: