diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-06 17:08:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-06 17:08:34 -0700 |
| commit | fb7246923f60e897a9328a3cd4dc8d78baf960c3 (patch) | |
| tree | 84bdf76b4c62e93196d25480e2426d5f09be8079 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b19b10d1af72bae1e492c73c8a352397aac911b5 (diff) | |
| parent | 94e8d04615dab9d6f88ef69d972046c446b62a43 (diff) | |
am 3cb2d3be: am 1862af57: Merge "SipService: supply PendingIntent when open a profile." into gingerbread
Merge commit '3cb2d3be6cb501c77c7a5765d954363125857cca'
* commit '3cb2d3be6cb501c77c7a5765d954363125857cca':
SipService: supply PendingIntent when open a profile.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions