diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-27 07:07:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-27 07:07:19 +0000 |
| commit | c95b753033ff3a75b45f74060eb59aff89a83e3a (patch) | |
| tree | 7dec9bd790debcd1a96d633f8447ca5214fd919a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b3b3d4ecbc0e51f9e3c36aee7cd74a51332f2e67 (diff) | |
| parent | b2344d6cd476178203de6a61b325a7a8e2064ff3 (diff) | |
[automerger skipped] Merge "DO NOT MERGE: GNSS: Add a check of SIM presence to GnssConfig" am: d09cf27486 -s ours am: 7bdeaf1905 am: ed0a5432eb am: 84d6557c88 am: b2344d6cd4 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399175
Change-Id: I827f0c2b53d86cb437a3e68d64b283d665a942a4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions