diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-25 13:03:53 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 13:03:53 -0700 |
| commit | a804eab848532dca35f9c46baf22d1d3feb5e6ac (patch) | |
| tree | 042c2eab4868050a1e32b79215e3ffa404f0427f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d914b96814c364373b04eac61e77ddaca78d5556 (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: Ia41cb5bff91294085516f9d400519031c22925c3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions