diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-05-15 00:05:54 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-15 00:05:54 -0700 |
| commit | 169f5853886c38a4ed5d4f8e72a56aca982e8766 (patch) | |
| tree | 8aae50b86286efff58db6f2fbf14b2045c7fbf05 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | fe61a8712363c663f444834e8b1ebc7b7febe8ce (diff) | |
| parent | c6edf97d595aaef5e75ee324be1397ce12349ce8 (diff) | |
[automerger skipped] Merge "Clean up the permission control code in framework" into qt-dev am: 4e1078e291 -s ours
am: c6edf97d59 -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 66404a1224 is in history
Change-Id: Id93f949ff5ac017127f0066b5b428774a6a0b92f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions