am 20c4a334: (-s ours) am 0b1a1f7b: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests"
* commit '20c4a33489f27fe704f6eb66ec49bc9063b59951': DO NOT MERGE: Add SmsTest and mege emulator smoke tests
This commit is contained in: