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