diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-25 14:09:28 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 14:09:28 -0700 |
| commit | 312fdcb40928ce1938f93cd8c3124c054d4b4f77 (patch) | |
| tree | d725c0b56fb0560830b109909571570166cf2fb8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 66f2e6ec7b410a46cce5651f2b1f52d154ccf096 (diff) | |
| parent | a804eab848532dca35f9c46baf22d1d3feb5e6ac (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
am: a804eab848
Change-Id: I71fbe9f0619154fdb9e904448e19a1c5b6fe8d67
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions