diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-03 22:31:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-03 22:31:36 +0000 |
| commit | e4177f5cb49ef683313f9ab3daadc5fffe5e827a (patch) | |
| tree | 8e8b6c418c465031d545885a27e1db01807e9397 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e8cf5f5ccd665c41b22f2c4c9636c2ddabb0b499 (diff) | |
| parent | 34c6c661535f332ed7158d0785e5ab1c5330a934 (diff) | |
Merge "Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" am: 21e6488ae7 am: ecd346e431 am: 6b96fe8128 am: 67236850f5" into rvc-qpr-dev-plus-aosp am: 34c6c66153
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365554
Change-Id: I40b85269a1f0c9ae065b12a7842d3be1e7c9b0f4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions