diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-26 18:05:30 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-26 18:05:30 -0700 |
| commit | 628f8edfef2f4818a9cf4250041d78efc57f919a (patch) | |
| tree | af47b108f9416595fc37d76046c69548e0cf2ae5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 55925438c74b94df49ff4cd0049b21f29c17335f (diff) | |
| parent | 9317856dd13a6f287fe4c45be5953ba190ead2d5 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into pi-dev am: 138f85570c -s ours am: ad8680bfcb am: cc499ed88e
am: 9317856dd1 -s ours
am skip reason: subject contains skip directive
Change-Id: I377aa22822bcf66fa03c2b8db60b0910387a6303
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions