diff options
| author | Kenny Root <kroot@google.com> | 2010-09-14 09:46:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 09:46:40 -0700 |
| commit | 1bf8fd86c259f98acaf42ec532a13fe48c6c0cf3 (patch) | |
| tree | 1664382aa17eb82db6f397d535fff7bd57ac2055 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 18747f78c6b294b015048f50f4369e2c8afe9ea1 (diff) | |
| parent | cc16981410d5265719c87ded80aa5af1366cf7bc (diff) | |
am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread
Merge commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2' into gingerbread-plus-aosp
* commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2':
Dedupe timestamp in PackageSettings
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions