diff options
| author | Wink Saville <wink@google.com> | 2011-03-14 13:47:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 13:47:20 -0700 |
| commit | e6cf4fcb5316fb632bbc8ee85d2ba894f6526b79 (patch) | |
| tree | c4abd7fae1e2b31973da821fd6ad90178c62cdfd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a9614308e161670e0e0b9ee75c1caf21b637476c (diff) | |
| parent | c8da3ddf3df453f57773d5f0b1bd1be68760d611 (diff) | |
am c8da3ddf: (-s ours) am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE
* commit 'c8da3ddf3df453f57773d5f0b1bd1be68760d611':
Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions