diff options
| author | Badhri Jagan Sridharan <badhri@google.com> | 2018-01-12 19:46:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-12 19:46:10 +0000 |
| commit | f2ffcd6458ed14b024d36dd51e250bbf653c0b25 (patch) | |
| tree | da8d018cb4706bdcb649b6f3371c6520429a7c87 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 82c264e0f27961523e4bd3511890bfd35a01fd7e (diff) | |
| parent | 5a26231e392a51c6aa9e1a01ff52559777552854 (diff) | |
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager" am: 22f4a681f9 -s ours am: 1ac5184053
am: 5a26231e39 -s ours
Change-Id: I52f02086bc92ac347249e935697fadcf6fb4c410
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions