diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-26 18:10:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-26 18:10:26 -0700 |
| commit | 16e1b3215248ce7dc7678ef4e45a2a8069831be6 (patch) | |
| tree | af47b108f9416595fc37d76046c69548e0cf2ae5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9b78f14db27992a32114d59bf836d00560ef1e3f (diff) | |
| parent | 8d24863bba0a0c8aa32c39afa1a95e6242dc2429 (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
am: 8d24863bba -s ours
am skip reason: subject contains skip directive
Change-Id: I5722044d178a8d706647a14e7ff78db331d664f0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions