diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-14 14:27:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-14 14:27:30 +0000 |
| commit | a6c5606c93938547585b685ada30713931b45c85 (patch) | |
| tree | 7e87a5aee3b8b8754cdc3e8240c03055b26030fc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3008a6e8470323929c7e1b3aeed550d334f80144 (diff) | |
| parent | 5afa840f4526a2709188b6fdfd9b384aadd68bfd (diff) | |
Merge changes from topic "am-6be8d866332e40f286e46642342a5555" into qt-r1-dev-plus-aosp
* changes:
Merge "Revert "Change attrbute of double-power-to-camera vibration"" into qt-dev am: 697989a615 am: 03e64d649e
Merge "Revert "Change attribute of fingerprint vibrations"" into qt-dev am: c0ef6a71ef am: cea66dd3d0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions