diff options
| author | Aaron Huang <huangaaron@google.com> | 2021-03-05 09:04:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-05 09:04:17 +0000 |
| commit | be50d6054b37684570b206fc998649da4e8d14cc (patch) | |
| tree | 8b9255378fbcbb7cd9b57e7a7c9c5896393b51b0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 00964166f42b4e4018f857fb9eda2582aef07fb8 (diff) | |
| parent | f3fb6b30990a851c027a189e399f2117f36e0485 (diff) | |
[automerger skipped] Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 918e60b615 am: 3fe7534d30 am: f3fb6b3099 -s ours
am skip reason: Change-Id I3dac94ec06f673aa719e124f1ef3d8169f68f9fb with SHA-1 cfff482b8a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574864
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib458f32902e64c63fc1fc9e2bb5bf92be801916b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions