diff options
author | Mark Salyzyn <salyzyn@google.com> | 2016-12-02 04:20:44 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-02 04:20:44 +0000 |
commit | 0a157b9c85750de9c798eb5c112d80a9b6879288 (patch) | |
tree | ddc8db4bbedba5e5cbe497b0e0b3ff4eeefcc2c3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 948073cc11b085c02325a6d9a516b4e9b683eb67 (diff) | |
parent | dc13cff10871380c585a6906596e14ba7e814a11 (diff) |
Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a" into nyc-mr1-dev-plus-aosp am: 8d8cfa2345
am: dc13cff108
Change-Id: I9c778ee9e042e44fd3b85aaf3c8ca80576188f0a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions