diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-25 21:10:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-25 21:10:50 +0000 |
| commit | 8d24863bba0a0c8aa32c39afa1a95e6242dc2429 (patch) | |
| tree | d725c0b56fb0560830b109909571570166cf2fb8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 64838ba31d10cb7684e4a33260e40ee694adb9be (diff) | |
| parent | 312fdcb40928ce1938f93cd8c3124c054d4b4f77 (diff) | |
Merge "[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" into qt-r1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions