summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorNathan Harold <nharold@google.com>2020-10-07 07:45:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-07 07:45:56 +0000
commit7510b0134054570311ea9e4db056231fb0bedfc0 (patch)
treeac13dc671462b3cd38cad254dff1139e0383048a /tools/aapt2/java/JavaClassGenerator.cpp
parent410f455b2b674352109134fd3d4fee30f69bbf45 (diff)
parent96631660af0d419a35145407b2ed891303b1e348 (diff)
[automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b am: e45ec287ed -s ours am: 94e5401f7e -s ours am: 96631660af -s ours
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e777d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597 Change-Id: I629ac86721649bd8dd2682ca80e226dbd8548131
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions