diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-25 12:37:25 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 12:37:25 -0700 |
| commit | ad8680bfcbd6c2c2d0039d3b99467d13749fe4a7 (patch) | |
| tree | 97de2eb6c6a4e67bc977cb6c191191112cee28bb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8f09cd3de1f40bec494aa3e0bb6e520e407a0a04 (diff) | |
| parent | 138f85570c22a4fb7333bb314b7e5313f1de9667 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into pi-dev
am: 138f85570c -s ours
am skip reason: subject contains skip directive
Change-Id: I6a094762a2cedb2aeba013bbd2a52adedac65963
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions