diff options
author | Mark Salyzyn <salyzyn@google.com> | 2016-12-02 04:17:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-02 04:17:15 +0000 |
commit | d456f91380206ed8e4a70e819e46018c93e52993 (patch) | |
tree | ddc8db4bbedba5e5cbe497b0e0b3ff4eeefcc2c3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | fc8601423a175ad1f72cd64b52a7de6570c76b61 (diff) | |
parent | 7513beb97fa44cd32571ec5d187dbe2525beae3a (diff) |
Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a am: 0fbd9b7773" into nyc-mr2-dev-plus-aosp
am: 7513beb97f
Change-Id: Ifbb1d18dbe623147bea71aa91caea299dab6d7bd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions