diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-04-17 14:18:15 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-17 14:18:15 +0000 |
commit | 20413a0609a3c70f53fa7c5a1622ae7ba0f094fb (patch) | |
tree | 20e12cb115b517f9d10c25ea7e1325d2f0d57f8b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 78005865af5a11f39beeb320ca6b039e951200e9 (diff) | |
parent | 2ce741e95368fe8117550ae52b0d0504c28f7fe6 (diff) |
Merge "[automerger skipped] Merge "Remove getDefaultTransactionName and getTransactionName from API" am: 8c74e1a7c0 am: 374db029ee -s ours am skip reason: change_id I66d6ba57f0b922335b972e718879c1d7e9b64d79 with SHA1 c5705a82b6 is in history" into qt-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions