diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-22 15:11:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-22 15:11:43 +0000 |
| commit | d1309f01d6e63c28e14063fcd1a982fea9a0c460 (patch) | |
| tree | 212a6ea3be361e5e6c2aa07496160e4ac76869eb /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ff1c5d38b48ff5574e8e1ebba7bb7f1aabd9d28c (diff) | |
| parent | c017f36d919ae9a0dd1599cb8addd16c7acf4a9a (diff) | |
Merge "DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: 230c78cec5 -s ours am: cee5738da2 -s ours am: 3f6eff5d5d -s ours am: c4315a02e9 -s ours"
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions