diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-30 16:05:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-30 16:05:51 -0700 |
| commit | b5ba1545b680913d18f45cc016b32730805932c7 (patch) | |
| tree | a176aa5d2d17be9c57724a051af51a2ec5b27385 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7deedbd508556df3b05e93f2300455bb42b09d5f (diff) | |
| parent | 3d067c43dce2b0bbf93c94ae3ef3f3509b79144b (diff) | |
am 4598d149: Merge change 9145 into donut
Merge commit '4598d149fb9c081877a214d74efadcb60d2acbb9'
* commit '4598d149fb9c081877a214d74efadcb60d2acbb9':
Add the encryption option to PptpProfile parcel.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions