diff options
| author | Ying Wang <wangying@google.com> | 2011-03-14 12:05:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 12:05:44 -0700 |
| commit | e1068ede91cfb5d21a003e0e9096b62c18004292 (patch) | |
| tree | 855a36a6202b2b08026ca4596ef41154fbd83117 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 13e6c46b484570c7aa731baf8cf78e5f32568964 (diff) | |
| parent | 0bdf9f8c48be4b001de2bac65b655063ca0d58ec (diff) | |
am 0bdf9f8c: am e5570255: am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread
* commit '0bdf9f8c48be4b001de2bac65b655063ca0d58ec':
Dist com.android.nfc_extras.jar.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions