diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-25 12:10:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 12:10:26 -0700 |
| commit | 1a3f859c78bd05c5f73335a620e253d7f2548294 (patch) | |
| tree | ca63618f0c250a2fa7d215bfe71b8790833febf1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 138f85570c22a4fb7333bb314b7e5313f1de9667 (diff) | |
| parent | 97111a1cb69983ce65ec734b49983bb1f51831ce (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into oc-mr1-dev
am: 97111a1cb6 -s ours
am skip reason: subject contains skip directive
Change-Id: I5210f8aed11e5b43bc09ce61f91ea399faa3dc4a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions