diff options
| author | Benjamin Schwartz <bsschwar@google.com> | 2021-01-06 18:42:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-06 18:42:05 +0000 |
| commit | f5c637719f71125b0d0fb29d397a9137e535bccc (patch) | |
| tree | e82a8220cee35a4fa5305583549d4bac4d4983e6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9858b561b182e14ed003b8b4e6be2900b434c625 (diff) | |
| parent | 32ae89039faa48ac13f96d471e6483b99f522fd9 (diff) | |
Merge "BatteryStatsService: Allow unknown wakeup string" am: 754d78cb7d am: 32ae89039f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531984
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I870f28416bdf80a7ee2b725b9ab31a0b503ce181
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions