diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-25 13:21:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 13:21:41 -0700 |
| commit | 00372429459c248c5ac960431f0ef0aa14cdeade (patch) | |
| tree | a2dac57c631260dfee4ef956b9b85b3c03854925 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | cc499ed88e9ff154dad14a6cfcc4aed2f78fda36 (diff) | |
| parent | bf0e0a04dd3d56b1c0cd73bbf99312a9a72b2642 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into oc-mr1-dev am: 97111a1cb6 -s ours am: 1a3f859c78 -s ours
am: bf0e0a04dd
Change-Id: Icf37ff99c3e7073c01214d2f9399a7a29f49e947
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions