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 | d48dbd94d15b271a3a5f1604544eaa6010cb9c88 (patch) | |
| tree | f4648c504bf8c5b7564e6464f39b445e3ead7d70 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 3d538100334e5fa658fd529480a939a5f5b1d9e9 (diff) | |
| parent | 37ce2010d91752cd9878c658110b30dfb443ee04 (diff) | |
Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into nyc-mr2-dev
* changes:
[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/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions