diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-26 18:08:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-26 18:08:41 -0700 |
| commit | 9b78f14db27992a32114d59bf836d00560ef1e3f (patch) | |
| tree | af47b108f9416595fc37d76046c69548e0cf2ae5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6f8630ffb05713ed44d2c6f4a5c95735d3a7d011 (diff) | |
| parent | 64838ba31d10cb7684e4a33260e40ee694adb9be (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: 1a3f859c78 -s ours am: bf0e0a04dd am: 0037242945
am: 64838ba31d -s ours
am skip reason: subject contains skip directive
Change-Id: Iaf2072a967b807d01847590c4ab7094834b3a669
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions