diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-04-05 18:49:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-05 18:49:12 +0000 |
| commit | 90231826ed71105ffa992a74df58a7538a958923 (patch) | |
| tree | 02ac0833d5bd23c9c292c84fd1e7fb11e14fcd5e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | eb6908df5e6434fc3fc86fd71508f263f7446035 (diff) | |
| parent | 03bdec953b6c59329413657fa68e0333ab777e67 (diff) | |
Merge changes from topic "am-210e5cc30e434357bd552419de9c31d2"
* changes:
Merge "fix AudioAttributes matching rule in AudioProductStrategy" into qt-dev am: 960c4f06ae am: d91287e09a
Merge "Revert "Revert "Mute haptic channels by default.""" into qt-dev am: f83192de79 am: 162ac3ad85
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions