summaryrefslogtreecommitdiff
path: root/include/utils/AndroidUnicode.h
diff options
context:
space:
mode:
author Jack Palevich <jackpal@google.com> 2010-01-09 21:54:28 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-09 21:54:28 -0800
commit91ea437c47ec1fde57746d757a46b8f56c9f3731 (patch)
tree02e006c44a49085c3359169c33b2dcaed4d96203 /include/utils/AndroidUnicode.h
parent370c36a17559166d7b21beb42ccbabd332b813ae (diff)
parent8577a7d4521a17ca3836ca0656f771072dfd66c9 (diff)
am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair
Merge commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp * commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5': DO NOT MERGE A library for encoding and decoding ETC1 textures.
Diffstat (limited to 'include/utils/AndroidUnicode.h')
0 files changed, 0 insertions, 0 deletions