diff options
| author | Les Lee <lesl@google.com> | 2021-05-06 05:51:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-06 05:51:37 +0000 |
| commit | 684ee29d963a30d78587f0b0854e219051e8b1cd (patch) | |
| tree | f53ff00f51f1f4aa0865fc0e4409fa134a152f69 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e39067a6e17fcf8ea48ed780793faa10e0c620cc (diff) | |
| parent | b9c68bbf3891aeb95ef2653f13a91de5e2f3bc58 (diff) | |
[automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: f437848713 am: d9592852bc am: b9c68bbf38 -s ours
am skip reason: Merged-In I047bc7dfe6a217c1a88faf3ed5c6783f33227c32 with SHA-1 7cee1c4f63 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697190
Change-Id: I5e340962372b9117d3a0cec79b3bb52d10ff8911
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions