diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-04-10 18:04:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-10 18:04:29 +0000 |
| commit | 03f68333b74902169b2f0da354b0299dc0f24e77 (patch) | |
| tree | 05f514e6f916e1283a9abf9a54a78855629b04cf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 68792e79d710d9ec05ebaa15e840438c16f500ff (diff) | |
| parent | 3649c804e2f846b82dcb9faf7fc9b667ab872742 (diff) | |
Merge changes from topic "am-b1f153a0df5841ff92c0ae3aff339fce" into pi-dev-plus-aosp
* changes:
[automerger skipped] Merge changes from topic "hidl-system-api" am: 88a2b68252 am: 09d3aef926 -s ours
[automerger skipped] Update HIDL-related documentation. am: 9efa13f38c am: 22795d2008 -s ours
[automerger skipped] Add remaining missing HIDL SystemApi methods. am: ff0a3642e4 am: 35d09a0d29 -s ours
[automerger skipped] HIDL: reportSyspropMethod -> enableInstrumentation am: 9312938842 am: 12071e63e8 -s ours
[automerger skipped] Allow HIDL to be used in priv-apps. am: 4dde8a113b am: d6b11ec69f -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions