| commit | 510fca8beb2113b38c943f17570d0248af356ac5 | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Fri Apr 04 16:39:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 04 16:39:25 2014 +0000 |
| tree | b774ad49a9f02b5cf0513e0170ec0f3e73111648 | |
| parent | d6ccbcd253d34feb75cba4cbd98f520dfa789757 [diff] | |
| parent | 20c4a33489f27fe704f6eb66ec49bc9063b59951 [diff] |
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