am 1e1681db: (-s ours) am 008dc16c: (-s ours) DO NOT MERGE: Combine emulator...
am 1e1681db: (-s ours) am 008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '1e1681db':
DO NOT MERGE: Combine emulator test projects into a single apk