diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-05 02:09:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 02:09:29 +0000 |
| commit | 8f7972942c59b1c7d444b14cdc44decb2e6b0945 (patch) | |
| tree | c89f3f2c5ee8114b6d11038abac7e5df8efac9db /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7e9471bfd60dc6aa9feceaaee1b0ae6d89e128d7 (diff) | |
| parent | dcfb14027c6732b5ad93c5623599d99ddbb6db38 (diff) | |
[automerger skipped] Merge "DO NOT MERGE: DropBoxTest needs PACKAGE_USAGE_STATS permission" am: b9c917f58a am: dcfb14027c -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1200159
Change-Id: Id65c01b81c9c9cdf5b6187889d017e8f9da16731
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions