diff options
author | Hangyu Kuang <hkuang@google.com> | 2016-07-25 23:45:38 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-25 23:45:38 +0000 |
commit | 601ececb8c01bf0512d3a580b0712db746e004f5 (patch) | |
tree | 0d2ebad531fe080533e9a1c6f8f88d949d5d7fcc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 2725d898224d2a95cbe75a1be30643e7ed5061e2 (diff) | |
parent | e7e1f0b788d4ff5eecaf3b41f280144bde755bd1 (diff) |
Merge \"media: Add hidden api to set video encoding profile and level.\" into nyc-mr1-dev
am: e7e1f0b788
Change-Id: I9322ddf1e5dba78363b87976639433f008620753
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions