diff options
| author | Chris Palmer <palmer@google.com> | 2010-09-27 21:02:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 21:02:20 -0700 |
| commit | cb3459e248ae1df8f74b89578b1f4321f3fec6ad (patch) | |
| tree | 355bbde30004c085072c85fa7f9e54c1710673b1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 81948205bf8ac383e8c140fd82988f718a3fac4f (diff) | |
| parent | f842cbb8e8391167d7a5b95f0f41d397e3b07680 (diff) | |
am d4f1436d: (-s ours) am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.
Merge commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853'
* commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853':
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