diff options
author | Amith Yamasani <yamasani@google.com> | 2013-07-12 11:21:27 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-12 11:21:27 -0700 |
commit | 8361a9f719b6a416a40134951daf28297b6e0670 (patch) | |
tree | 8e556825a56df52c4c446a9124d169b4149301ed /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a4ee3088e74bb9b38dcd469df4dc929f1c935ff3 (diff) | |
parent | 1a1a7c0878320b94d01da6bdfaa857c85b4199a3 (diff) |
am 1a1a7c08: am 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '1a1a7c0878320b94d01da6bdfaa857c85b4199a3':
Pass along the user id to AttributeCache requests
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions