summaryrefslogtreecommitdiffstats
path: root/opengl/tests/textures/textures.cpp
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2010-08-04 22:33:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-04 22:33:08 -0700
commitbc088ddecb05de39f7e96e44de394add975baecd (patch)
treeca221a6541eba474d17b3b10ea01b12b4c4714ce /opengl/tests/textures/textures.cpp
parentd088cef7da5f17b6d1ea16196c24032f39c9eb32 (diff)
parentcde66df44240cfe5a7bec12ac52464c3bf26c14f (diff)
downloadframeworks_base-bc088ddecb05de39f7e96e44de394add975baecd.zip
frameworks_base-bc088ddecb05de39f7e96e44de394add975baecd.tar.gz
frameworks_base-bc088ddecb05de39f7e96e44de394add975baecd.tar.bz2
am cde66df4: Revert "Move SIP telephony related codes to framework."
Merge commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f' into gingerbread-plus-aosp * commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f': Revert "Move SIP telephony related codes to framework."
Diffstat (limited to 'opengl/tests/textures/textures.cpp')
0 files changed, 0 insertions, 0 deletions