diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-09-16 04:48:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 04:48:15 -0700 |
| commit | 4e7177bdd15e35e2a6f6687f95d9217f91a37ae4 (patch) | |
| tree | ce9a4197ae4a4ae8a43c0e26d2b8d0a41c86bf3b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d2cd188936750b9e6205fe5cd5d9178ab5fb6192 (diff) | |
| parent | d2492e3da280842b55d18d54f754da164c2537e2 (diff) | |
am 170255b0: am d8f3d167: Add a new phone state ANSWERING.
Merge commit '170255b0f0482baf843b881a02d9361adcc33742'
* commit '170255b0f0482baf843b881a02d9361adcc33742':
Add a new phone state ANSWERING.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions