| commit | c64ef759ac1ffc0a193f71b29fc8f7a648e931d8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Oct 12 16:37:44 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 12 16:37:44 2010 -0700 |
| tree | b7cfdbd700510f6ee301d28fb58f03617624ed2c | |
| parent | 8cbb1e7af4d12b5e348d6be88922ce5b6c8495d2 [diff] | |
| parent | 6bdd5294408484a6ca1c403a9a9a88a9e7335de3 [diff] |
am cf88cf87: (-s ours) am 15f7ff3c: Merge "Fix compile errors in telephony tests" Merge commit 'cf88cf878be96a564b38f428c161cc864dfad56d' * commit 'cf88cf878be96a564b38f428c161cc864dfad56d': Fix compile errors in telephony tests