diff options
| author | Collin Fijalkovich <cfijalkovich@google.com> | 2021-01-07 01:09:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-07 01:09:02 +0000 |
| commit | ac67934dae514c925c4b377bd3ab773e7c311ef5 (patch) | |
| tree | 39205f48e7c64699b0073b04aa9f7e63808f94f6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3bd551ede269d39438793e4fc3e0e117254a8615 (diff) | |
| parent | 2159e77523e400dd6f8b7cf5f2a3b60e998a43c7 (diff) | |
Merge "Allow Traceur to take START_FOREGROUND_SERVICES_FROM_BACKGROUND" am: c9edda6886 am: 2159e77523
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541332
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I608ab5f1f324c5aff31e552bb5575b1e81a1f240
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions