diff options
| author | John Wang <johnwang@google.com> | 2010-08-02 15:33:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-02 15:33:47 -0700 |
| commit | e7a311ac0687527908311a4226481e3abe9c6f81 (patch) | |
| tree | 81e3f34c8345b60f834f7ae515dab583345d0835 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 25a04d660bc1ba98b55db19ee0158b414c9ecd80 (diff) | |
| parent | 156abdaf9952b61181727ae03b8e67880b99cde9 (diff) | |
am 8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread
Merge commit '8bffa72b9c711fec231108977ad9f2ba72678a82' into gingerbread-plus-aosp
* commit '8bffa72b9c711fec231108977ad9f2ba72678a82':
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions