diff options
author | Greg Kaiser <gkaiser@google.com> | 2020-12-22 21:07:25 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 21:07:25 +0000 |
commit | 5a7b24f6a1727a58c8bbf1c64d0af01565698789 (patch) | |
tree | 6a880a2ef87414debaee71281531db6a0ff8de93 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | cc5488287c3f198138ce7049b9ae162b5141ade1 (diff) | |
parent | 9ad1f6565e575c061afe5e84507f611af8a26dce (diff) |
Merge "Revert "Fix permission on TM#isDataEnabled"" am: 469e5b3317 am: 3033b15191 am: 9ad1f6565e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534329
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6a1a974bd0456efbf92a1be1fbc5ace38499e636
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions