diff options
| author | 2019-06-25 18:36:14 +0000 | |
|---|---|---|
| committer | 2019-06-25 18:36:14 +0000 | |
| commit | d538410fd251e31d5f863e0a6095a36c900d754d (patch) | |
| tree | 2d028751e17184a738f2c820ed6a5f563f73743f /libs/androidfw/AssetManager.cpp | |
| parent | 266c76f8e5e763d426edf2fe1872827740426224 (diff) | |
| parent | 0984de50e397fd6c58e7dd110ad6f2c96d678331 (diff) | |
Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into nyc-mr1-dev
* changes:
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions