diff options
| author | Daniel Bright <dbright@google.com> | 2021-01-06 03:16:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-06 03:16:37 +0000 |
| commit | 16d63927bfcb46462732c75471130c810ec1a5ff (patch) | |
| tree | 450ca1d3d4331876b9068672d3af80c8cbd3265f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3eb95a64b3b5f5fa8fef22d348f528a033de7882 (diff) | |
| parent | a36986be6c2029d1ac8abd2a426041a4dc885e59 (diff) | |
Merge changes from topics "apn_throttle", "rename_retry_interval" am: 1948c69946 am: a36986be6c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536201
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia81a74e369cb395ff92a2276480015df3e0c9a56
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions