diff options
| author | Dan Egnor <egnor@google.com> | 2010-04-08 14:53:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-08 14:53:06 -0700 |
| commit | 00e55cbf876606a3522e56e779acb50e810ab90e (patch) | |
| tree | 29bbf39e6ff004477b6949327165181486dffbd5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1dbebb262723cec53f64d1587c1fd3851c03133c (diff) | |
| parent | 02b338b7f2919e4005a8e53ab39b67a24eedd270 (diff) | |
am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
Merge commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b' into kraken
* commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b':
Change TrafficStats to a new JNI implementation.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions