diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-25 12:58:33 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 12:58:33 -0700 |
| commit | d914b96814c364373b04eac61e77ddaca78d5556 (patch) | |
| tree | 042c2eab4868050a1e32b79215e3ffa404f0427f /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 6e97b7bd29e62cf8f48ab34c28f0ccd235ba69d7 (diff) | |
| parent | ad8680bfcbd6c2c2d0039d3b99467d13749fe4a7 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into pi-dev am: 138f85570c -s ours
am: ad8680bfcb
Change-Id: I728d002732730f22068ec1595ebc0a8abedfbc40
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions