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