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