diff options
| author | Amin Shaikh <ashaikh@google.com> | 2016-12-21 22:30:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-21 22:30:32 +0000 |
| commit | a663b4bb06488e74f4d727191babab8c3e003789 (patch) | |
| tree | cb68df278722b87fa6333aee8cc95ede7c3cf06b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 82ac8c11fc0183b949da4bff46ca492a3e9b49bd (diff) | |
| parent | 9926363b0938f6ce8bdc6b1146867a0f1d65a97f (diff) | |
Merge "Expose ScanResult#untrusted as a @SystemApi." am: a93e57f1ac am: a3943850ab am: 471093b58e
am: 9926363b09 -s ours
Change-Id: I2bb1214df6132f414214241f8e91d9c4b95d7c9a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions