diff options
| author | Bart Sears <bsears@google.com> | 2015-03-05 01:29:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-05 01:29:43 +0000 |
| commit | d1e947313bed81230cd29e601c2ae528b7990cad (patch) | |
| tree | 45c03090968e027353e60cd583d8fd9ce1225d49 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 60b9a5e773aeb40807af26f389ed1d10ec89d0df (diff) | |
| parent | 1445dec74f0411206e8964d4efbf01668a791e2e (diff) | |
am 1445dec7: am 5a1cec86: am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '1445dec74f0411206e8964d4efbf01668a791e2e':
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