diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-25 13:17:16 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 13:17:16 -0700 |
| commit | cc499ed88e9ff154dad14a6cfcc4aed2f78fda36 (patch) | |
| tree | a2dac57c631260dfee4ef956b9b85b3c03854925 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 9c9c561e8b4d5d4673237f4b4ba6c43a7e1ffdc3 (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: I4d3529c5df07d5f9eb84785bfa3c27ea0152a923
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions