diff options
author | Narayan Kamath <narayan@google.com> | 2014-04-10 11:25:56 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-10 11:25:56 +0000 |
commit | 3603970d3a8a2215027e96c4861e1ab9eec86f79 (patch) | |
tree | 3c820886f39d85b51c4973e9f3e5bd6e3fe60d53 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 9e289d70a8baaed0030413b5991653792e2a816d (diff) | |
parent | 940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba (diff) |
am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba':
Removed android.debug.JNITest from preloaded-classes
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions