diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-08-24 18:13:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-24 18:14:01 +0000 |
| commit | 8ae79de881bf4285bc5a57003eefb497de4111dd (patch) | |
| tree | 6f17e88dbcad7c4e934cdfc177aa603ee88fb30e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e914569fb8d1d277bc8863a7d09d6485c2df63c8 (diff) | |
| parent | 3e73c0c93e6807e3290937d72b115d35a1f0ccb1 (diff) | |
Merge changes from topic 'am-25ded4410ce544918d9fbc387ab4e1e3' into cw-f-dev
* changes:
Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev am: d90b69ffb1
redact PII only for non-null value and apply SHA-1 am: d0a7649f53
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions