diff options
| author | Andres Morales <anmorales@google.com> | 2014-11-10 16:58:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 16:58:53 +0000 |
| commit | 9e19c118a140518859563ba81b691c6998e5084c (patch) | |
| tree | 458adfa47803d4b1b77e288eedb654ff658f8c19 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 93cdf1041e018bbf5bbe85ceb3b1ba018b99e526 (diff) | |
| parent | 9467926bd14a2d7f92fcdfdc7207f84d951f6e1f (diff) | |
am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
* commit '9467926bd14a2d7f92fcdfdc7207f84d951f6e1f':
Unhide DISALLOW_OUTGOING_BEAM
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions