diff options
author | Bryan Ferris <bferris@google.com> | 2019-06-28 20:25:22 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-28 20:25:22 -0700 |
commit | 4675762f471ec65996b95d73aa42abbf70df3e99 (patch) | |
tree | 1eec103d185bdf620418a4aa27e3ab6a28be66c4 /rs/java/android/renderscript/ProgramStore.java | |
parent | f8d5408a597aefbc1984c34ea433f5882386950b (diff) | |
parent | e74647d6777ddf18bb90cc390295cb79e7dcb5bd (diff) |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours am: 8b98bdc834 am: 6b4e794ccd
am: e74647d677 -s ours
am skip reason: subject contains skip directive
Change-Id: I75f9b0c3145812ea00b576bebd7edbbd5cdbf02a
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions