diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-17 04:19:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-17 04:19:57 +0000 |
| commit | 149ef2b6c687e4e4d9d11dee2b2339f0a600b3dd (patch) | |
| tree | 1188a3e33ae78194bdbc5eac27a7f890137530a7 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 6add7f27d1b1ac63ad55a83ed0612ef288986490 (diff) | |
| parent | 542eb0900283d821e99a167c6cd27d32af593ccb (diff) | |
Merge changes from topic "am-79f86a8dcf76422daca2ee482cf222f3" into rvc-d1-dev-plus-aosp
* changes:
Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 8c4224a070
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 232afa51d9 am: 259ec64f48 -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions