diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-06-03 12:58:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-03 12:58:35 -0700 |
| commit | daca1ada02ef2dbad10938f336b37fd2ab5a5cc8 (patch) | |
| tree | 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1ce3ee8a002811b3ee1c524b7599b53b363763be (diff) | |
| parent | c253940208885e7209f74123678fa0d8cfdea468 (diff) | |
am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
Merge commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e' into froyo-plus-aosp
* commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e':
Doc change: Adjust security sandbox description.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions