diff options
| author | Chris Palmer <palmer@google.com> | 2010-09-27 14:18:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 14:18:15 -0700 |
| commit | f842cbb8e8391167d7a5b95f0f41d397e3b07680 (patch) | |
| tree | f1f0e7831502036b3e854a76778f8c6ae8d6def6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d9806b8fd8c52e5cca8b3b9165bee43679aa4084 (diff) | |
| parent | 674166e6fc41f8624f7d06dfb69a56dce3e4adb1 (diff) | |
am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.
Merge commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp
* commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3':
DO NOT MERGE Clarify the explanation of Android's security design.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions