diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-02-25 18:48:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-25 18:48:12 +0000 |
commit | bf3fd0626aea6640a8ed670a0abe342391b9705f (patch) | |
tree | b2e27b0883a873e2c0b3cfc32711425d72031fdb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | fb19bf21b55ab03d7a98b1b2c25bcee433f801e9 (diff) | |
parent | b1e0cce208b17e8b5f083f9f72e3443177077c3f (diff) |
Merge "[automerger skipped] Merge "Allow UiAutomation to adopt the shell permission indentity" am: 9f0115bb6e am: 178684530b am: 0acab502a0 -s ours am skip reason: change_id I4bfd4b475225125512abf80ea98cd8fcacb6a1be with SHA1 d873ae62c4 is in history"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions