diff options
| author | Nathan Harold <nharold@google.com> | 2020-10-07 07:47:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 07:47:25 +0000 |
| commit | e4d4916078e8d0da7f75642514b98198d4e028f8 (patch) | |
| tree | 2e5b211674c5abd0545f0ade3f494fd4d47fc3fb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 606869a99cd7de5bdb336c0acc2454e5a4dc07e1 (diff) | |
| parent | 96631660af0d419a35145407b2ed891303b1e348 (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: I4da51f8fad76a3c6dc10b261a957b9298ff49483
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions