diff options
| author | Bart Sears <bsears@google.com> | 2015-03-05 00:59:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-05 00:59:01 +0000 |
| commit | 1445dec74f0411206e8964d4efbf01668a791e2e (patch) | |
| tree | 77fd98ec62a0cf3e501cfd54ed616ec63ae4d7cb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 80cb73006d6c14f9a9cd506172d9223cbca8606f (diff) | |
| parent | 5a1cec86cfb3f08fac06ed26fe81247c3415d3ca (diff) | |
am 5a1cec86: am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '5a1cec86cfb3f08fac06ed26fe81247c3415d3ca':
Do not make ActivityContainer available to apps. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions