diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-25 18:36:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-25 18:36:14 +0000 |
| commit | 46c0bc94074ba7a72f8146c0e964d7353ff15df4 (patch) | |
| tree | 260d6bc49a5c8a5b26b798ec1cedc82f0ad999df /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7af053390ad2f4423972efa160987bf87ff67c79 (diff) | |
| parent | 51bb7163321e625815917421e69de6ed4c852995 (diff) | |
Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev
* changes:
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions