| commit | eea325e5583803228a06d1a3395b6f994d45619b | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Fri Apr 04 16:47:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 04 16:47:08 2014 +0000 |
| tree | 7d3b1e6396f2cb994c8fe6d6d206170870a5f1f5 | |
| parent | 8821b239d175f441c1631f9ce04f9b0109dd3a72 [diff] | |
| parent | 510fca8beb2113b38c943f17570d0248af356ac5 [diff] |
am 510fca8b: (-s ours) am 20c4a334: (-s ours) am 0b1a1f7b: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" * commit '510fca8beb2113b38c943f17570d0248af356ac5': DO NOT MERGE: Add SmsTest and mege emulator smoke tests