diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-22 11:14:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-22 11:14:44 +0000 |
| commit | 85b5b118fcd2b528fb54a3b097bac11ce4ef5b5e (patch) | |
| tree | db6f9611dd18dc7b5cd1e46a411fa5dc72bf66eb /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 83dff5f96e68d3853cc96804279c935fe7a389af (diff) | |
| parent | 14f88702b12a631943a9b7ecfbc657941b6ddea4 (diff) | |
[automerger skipped] Merge "Add carrier config for NR timer reset" am: 71b90ae022 am: 8a84baa296 am: 8f6335b3fa -s ours am: 14f88702b1 -s ours
am skip reason: Change-Id I9802b8712798054a85307e549fb665bc85166311 with SHA-1 3a3af2fc2f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1367056
Change-Id: I8274b830ce1c74bd116ec289ae2db98ccc1a1ae9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions