diff options
| author | Hai Zhang <zhanghai@google.com> | 2019-02-27 12:49:18 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-27 12:49:18 -0800 |
| commit | 3e29ba23a4eeddda664537f00c3a871f944d6002 (patch) | |
| tree | ef356a55d1273ee74ca86941c291cac71c733afe /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e2791fc1b1b0a1366175f4f9a2e34ce2311c1f8a (diff) | |
| parent | 50f59c1c9b30ee77e4db5168c3c2aee4dbc1181b (diff) | |
[automerger skipped] Merge "Add OBSERVE_ROLE_HOLDERS permission to shell." am: 3d8cef1fa8 am: 7e9b5b3c76
am: 50f59c1c9b -s ours
am skip reason: change_id I5c979a26dae103ea1b633c2119c59363d8953aa2 with SHA1 abf0d98d61 is in history
Change-Id: I5be20d4dcb1d30740aa8e152e8433e7e3ee7fbbd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions