diff options
| author | Scott Main <smain@google.com> | 2009-12-04 04:30:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-04 04:30:21 -0800 |
| commit | 6eacdea7afb55f3b5ced7b487197585e24bff2e7 (patch) | |
| tree | 37f61c7524bb82535ed7e13f9a60e2ef646a2777 /opengl/java/android/opengl/Texture.java | |
| parent | 6b004b350fea86761bd5e75c2ccb31c086bf3492 (diff) | |
| parent | 06ef1d2104b4c90d5b134ae17e2562fd6bedda17 (diff) | |
am 06ef1d21: am 9f0fa1f4: Merge branch \'eclair-mr2\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2
Merge commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17'
* commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17':
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions