diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-04 23:07:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 23:07:39 -0700 |
| commit | 94e8d04615dab9d6f88ef69d972046c446b62a43 (patch) | |
| tree | 98068ff36940ccebbfd23dc2bf49dbcfbcde2c09 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 445a624a241652cc229e1d746521ae0ee448ee34 (diff) | |
| parent | 8ab75237521106ebb3ff0042ab5c4181af266e62 (diff) | |
am 1862af57: Merge "SipService: supply PendingIntent when open a profile." into gingerbread
Merge commit '1862af57b2c5ca5387b12974e8ef661651edb97d' into gingerbread-plus-aosp
* commit '1862af57b2c5ca5387b12974e8ef661651edb97d':
SipService: supply PendingIntent when open a profile.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions