diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-17 04:33:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-17 04:33:09 +0000 |
| commit | 5d508893638ece0696c81554f12cb93e368ab03c (patch) | |
| tree | 31472d353040e2991bc2a5f44fe42b86bd7cd0e0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f2aac3697e0ea044f21b869d695de53f1c086e78 (diff) | |
| parent | bca30e9f315254ea29ceca4003905f4e4fcb92a2 (diff) | |
Merge changes from topic "am-3081ec444acb4d69974a1b8546d081d1" into rvc-qpr-dev-plus-aosp
* changes:
Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 8c4224a070 am: 2909a2ae8f
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 232afa51d9 am: 259ec64f48 am: fe9d1d5eb1 -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions