| commit | 77b9c89f83ea005a298da39ad13eedb80d84f31e | [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 | d9048e7c75f0c1cb271d4713155a7b76d44f6f43 | |
| parent | c88a1f955c56a6cc0527ddf045ac93c657ca859d [diff] | |
| parent | cf88cf878be96a564b38f428c161cc864dfad56d [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