diff options
author | kmccormick <kmccormick@google.com> | 2013-03-28 15:24:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-28 15:24:39 -0700 |
commit | 99049335a604cae3f515fce32bc5f1b27fe8d29b (patch) | |
tree | 4a874af0450bef76361a6013286790fb6711e616 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 571c01b494be76af9291b87c09f43a0fb30b3edb (diff) | |
parent | 3ed65cb3496afe90d82bfadbff4d2687189ae47d (diff) |
am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
* commit '3ed65cb3496afe90d82bfadbff4d2687189ae47d':
Doc update: superceeded > superseded
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions