diff options
author | Fabian Kozynski <kozynski@google.com> | 2019-06-27 10:42:34 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-27 10:42:34 -0700 |
commit | 48746ace697954e17f4702021947672de89f9802 (patch) | |
tree | d02288a70a1a67d6ae4c27c387b42f1587811c15 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a2a25a3e3ab316dafab3fe259070272733c9703b (diff) | |
parent | f880f9e11a341db6045084ddc4911cf892c4ea1f (diff) |
[automerger skipped] Merge "DO NOT MERGE Revert Privacy Indicators to P" into qt-r1-dev am: e8c61a23f8
am: f880f9e11a -s ours
am skip reason: subject contains skip directive
Change-Id: Idd904e8502d3c04716f65898c1c38b6022948d94
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions