diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-10 21:12:11 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-10 21:12:11 -0400 |
commit | 09c5013b43d0bd1e96fd67d56ca2ffa1bc8e07f9 (patch) | |
tree | 5a9247f35f2ba7be849680bf24f655f578bc6109 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | c4df17dc7311659ff8cd5a9a95f89f8649db83eb (diff) | |
parent | 1d5ca47adf581f5b7875fb88024300471cccc14a (diff) |
Merge change 24514 into eclair
* changes:
Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions