diff options
| author | Marie Janssen <jamuraa@google.com> | 2016-09-21 07:27:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-21 07:27:00 +0000 |
| commit | 085eb0e9175a40b2e8092b1bded115d25ee89342 (patch) | |
| tree | f5afed163030bc3dac13a88ac47a4991488da133 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6685014f34d33fa38dc8b7a4b3c920eb4af614f2 (diff) | |
| parent | f53d0f4925f7cfdc4459a4402ef6cdd608ac0df0 (diff) | |
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb am: 0ed17e5c8d am: 9013d67f0c am: 7e593bdf0d
am: f53d0f4925
Change-Id: Ifc7c721dd32193b86d28cd136bc79308bbd3ef18
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions