am 1601b1c9: (-s ours) am 6c56e9e1: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner"
* commit '1601b1c9e632cce64d9f9aa676891e228b28eb73': DO NOT MERGE: fix package for AndroidJUnitRunner
This commit is contained in: