| commit | f30f3f3ecf2f8857da72eac51e234cb74f4c574e | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Tue Jun 17 18:06:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 17 18:06:34 2014 +0000 |
| tree | 896571c028cab69417573ce0be5b4ad8c6f90532 | |
| parent | f892f789d3708d2bd95338e8b37cef2d9abb2372 [diff] | |
| parent | cd4e61bafcb01f4bb70b5209f5994b6fffda6640 [diff] |
am cd4e61ba: (-s ours) am b5d6adee: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" into stage-aosp-master * commit 'cd4e61bafcb01f4bb70b5209f5994b6fffda6640': DO NOT MERGE: Add SmsTest and mege emulator smoke tests