diff options
| author | Tony Mak <tonymak@google.com> | 2017-09-11 16:44:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-11 16:44:43 +0000 |
| commit | f69d09b3831b217c7ceb1f2f93d05dfd649a6afd (patch) | |
| tree | abf1e568b4a330cfb465e3aa91445034c6a91c08 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 09fc5ea393dbfe5457f37f17baadc8ab08389d3d (diff) | |
| parent | ebb4cf4b5176164ae8df38e69991e1c44658de94 (diff) | |
Merge "Merge "DPC should not be allowed to grant development permission" into oc-dev am: 5e4b2b15ec am: f1aea743fd am: 0b80fb29b1" into oc-mr1-dev-plus-aosp
am: ebb4cf4b51 -s ours
Change-Id: Ia17b46b323102e40194dce6c69bcd915db1a8356
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions