diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-22 10:59:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-22 10:59:50 +0000 |
| commit | 14f88702b12a631943a9b7ecfbc657941b6ddea4 (patch) | |
| tree | c1657adbb57c5a278596ddc583a251250f70c0ab /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | b897b0b7b6c844621f3809de631b64bcdef9f487 (diff) | |
| parent | 8f6335b3faf5e6b1f0f01dd429d26136282a7a0f (diff) | |
[automerger skipped] Merge "Add carrier config for NR timer reset" am: 71b90ae022 am: 8a84baa296 am: 8f6335b3fa -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: I93b4b9e3787ceebf55aadb7b79e590e5ea31121c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions