diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2019-08-08 15:17:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-08 15:17:51 -0700 |
| commit | 9c9c03ac9204dc38580c2d37c272d1a56344b147 (patch) | |
| tree | caf560023365103982b689ae664f9be0199fe1bc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5f85c1fe745cd224f49f71d3db6d5118072f25c4 (diff) | |
| parent | c2f30648c3e1c204bbeecc8db8cfc5793f603245 (diff) | |
[automerger skipped] Merge "Add a blacklist for preinstalled carrier apps." into qt-dev am: aa3689c4d9 am: 60cc649995 -s ours
am: c2f30648c3 -s ours
am skip reason: change_id I0afec28f1f18227947c1fe9e6bb5fd0dad3b5dac with SHA1 e016781807 is in history
Change-Id: I7c0e4f825093dc0db2e07d16ff78bcbd5780cdd4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions