diff options
| author | Andres Morales <anmorales@google.com> | 2014-11-10 17:05:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 17:05:20 +0000 |
| commit | e4aa7e7793797111927ee0eca8683695098c65a6 (patch) | |
| tree | 068931edba22cadf9472f98386e701d0cd662b67 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4eb22e44b94ae0fbba9e8ca862860d6de902e7ee (diff) | |
| parent | 9e19c118a140518859563ba81b691c6998e5084c (diff) | |
am 9e19c118: am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
* commit '9e19c118a140518859563ba81b691c6998e5084c':
Unhide DISALLOW_OUTGOING_BEAM
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions