summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/Program.java
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2010-08-20 16:34:16 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-20 16:34:16 -0700
commitb2cc86da29452769ff6210f1dfef4b51aac1d75e (patch)
tree63f5223297a6d583d788d29e41a64c5497d9dee8 /graphics/java/android/renderscript/Program.java
parentd6f7f225689ecd33dc54699acc01cfafc781c20d (diff)
parent3158cf689f4994ec53c3b727f9b6ad7751a5551b (diff)
am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b' into gingerbread * commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b': Change CDMAPhone.getDeviceId to return MEID or ESN.
Diffstat (limited to 'graphics/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions