diff options
author | Suprabh Shukla <suprabh@google.com> | 2019-09-27 20:29:45 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-27 20:29:45 -0700 |
commit | 783f182dda2089507629ba168f60acd022b856ac (patch) | |
tree | e2b6e8a7f1fa689a6fa01201aa45e7045213fc06 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a3d4453254e13e95ae1c325b863d923a200558af (diff) | |
parent | 94a7c3f1d57d1371cd0843b4538a4a8a392db7db (diff) |
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev am: 0e8f1fa5e9 -s ours am: c6a2982b86 -s ours am: 2fa2bae0fe -s ours am: 7b0406196e -s ours
am: 94a7c3f1d5 -s ours
am skip reason: subject contains skip directive
Change-Id: I7a8b411d4f1fc258dc1ccb3a925cf8d449094db7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions