diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-24 22:49:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-24 22:49:16 +0000 |
| commit | 9b80f5fed14e6db7bcf34f33541dc915eaf8af11 (patch) | |
| tree | e0992e07da06fd89955491045c66c18023eb60a9 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 96ee983ab55fe652f55f699a9f6cf2f19a7f8c2c (diff) | |
| parent | f31ee636c912aa3c0c9dd4e6a5ba3bb2fa58f3e2 (diff) | |
Merge "Merge "Allow network stack UID caller to retrieve cell identity" into rvc-dev am: 855eb749ed am: 4f7fa277ab am: b8b8f1323b" into rvc-qpr-dev-plus-aosp am: f31ee636c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12226436
Change-Id: I6e8c3a67a6356ea179abd45e49b2725813cbdbdd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions