diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-27 16:29:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 16:29:33 -0700 |
| commit | 915db0da4521814e1ec460be724281438b25fee7 (patch) | |
| tree | f1f0e7831502036b3e854a76778f8c6ae8d6def6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 46fc90c68034aae0769f80623523877696300c13 (diff) | |
| parent | 6e0e4c4f119a4370a33e0bae6e289cf1470be307 (diff) | |
am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread
Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp
* commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
Move SipService out of SystemServer to phone process.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions