diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-26 18:06:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-26 18:06:57 -0700 |
| commit | 6f8630ffb05713ed44d2c6f4a5c95735d3a7d011 (patch) | |
| tree | af47b108f9416595fc37d76046c69548e0cf2ae5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 628f8edfef2f4818a9cf4250041d78efc57f919a (diff) | |
| parent | 66f2e6ec7b410a46cce5651f2b1f52d154ccf096 (diff) | |
Merge "[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: d914b96814" into qt-r1-dev-plus-aosp
am: 66f2e6ec7b -s ours
am skip reason: subject contains skip directive
Change-Id: Iefefde11b7efd94e08c9ad212bffc98d5bfe8376
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions