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