diff options
| author | Aaron Huang <huangaaron@google.com> | 2021-04-01 17:09:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-01 17:09:23 +0000 |
| commit | 4cbbf1aa6c541c0432a2b6418360867f6312ef84 (patch) | |
| tree | 8f5c32ff21741e4c2b9807c6854b2a91d5c866c9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 34cfcb8226e5462050f15c85839c0bbbf440bbe4 (diff) | |
| parent | 5b1b6bf264ac9ab93e669332a10f49ed24925b69 (diff) | |
[automerger skipped] Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e427565991 am: 40b438abcc am: 5b1b6bf264 -s ours
am skip reason: skip tag Change-Id Ib667c115e5f1e01237d88b77bba753363da309cc with SHA-1 c03b2044dc is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861
Change-Id: Ia90d90c5bf7429ad2a7f50d6e055f6dec28f3ea9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions