diff options
| author | Tim Murray <timmurray@google.com> | 2014-02-03 23:20:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-03 23:20:03 +0000 |
| commit | 6faecbb8d2b9f99d88913a0a7af592e193e8a8ae (patch) | |
| tree | 8902bb9d3c16a6452b957b91a263e17c77c198d6 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 430986178dfcc46d84bafd8ad39a16eba30844fd (diff) | |
| parent | fd71ddfd4378de331e231fbe22beb92f1efcd196 (diff) | |
am fd71ddfd: (-s ours) am 6ceac9f0: (-s ours) am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
* commit 'fd71ddfd4378de331e231fbe22beb92f1efcd196':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions