diff options
| author | Fred Quintana <fredq@google.com> | 2010-08-05 17:51:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 17:51:28 -0700 |
| commit | 2a45dcec268fa1f7c272445f9e57d9f18f2d2734 (patch) | |
| tree | fa9980169c3a61a355714df5f4a5f96a26944d62 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3a489ccd2de2be78e67223732506169d6be71925 (diff) | |
| parent | 6b5cdc76df3efcada68e3fa1dd056d8b052d7857 (diff) | |
am 5005a6c0: am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
Merge commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803' into gingerbread-plus-aosp
* commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803':
Changed SyncOperation.toKey() to not rely on the implementation of
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions