summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2010-08-24 10:16:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-24 10:16:42 -0700
commitb422ca809c92e3136bdf1f3820c4d59c61bc8e57 (patch)
tree8c4a67acc46915e984d48f41be570be6032d88ab /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
parent0fc1b793b68d4c0ee2eafad6618dea0f2722c2cc (diff)
parentd90348796829f3d3a443e73ea3b3f2f9e79071c2 (diff)
am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2' * commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2': Change CDMAPhone.getDeviceId to return MEID or ESN.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions