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