diff options
| author | Christopher Tate <ctate@google.com> | 2015-06-27 00:51:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-27 00:51:54 +0000 |
| commit | 2c7c7f7f1188460270b9bcb62fd4d5be8e8bbb2f (patch) | |
| tree | 0f1db764d981275f1153d497e531a2363708e4de /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f45963dd195c4c5b7dc004fb256d5cb6f5f30a0f (diff) | |
| parent | b035c6d9a6827510e6ee3f855827cf6e428adb22 (diff) | |
am b035c6d9: Merge "Properly scope the "only http/https schemes" intent filter semantics" into mnc-dev
* commit 'b035c6d9a6827510e6ee3f855827cf6e428adb22':
Properly scope the "only http/https schemes" intent filter semantics
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions