diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-24 16:33:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-24 16:33:02 +0000 |
| commit | f8a5820817eb59e0fe16e3ce0f10bb3dca090192 (patch) | |
| tree | 49d78fb80f80c15b75f873bbbeaef0ea71b425c3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 07bed4921a05e717a4b7f10a25e3830e346426b7 (diff) | |
| parent | 03981a4c2e9689197e4d2c916c07ae16207b5276 (diff) | |
am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev
* commit '03981a4c2e9689197e4d2c916c07ae16207b5276':
Add activity attribute allowEmbedded
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions