diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2019-05-15 18:16:50 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-15 18:16:50 -0700 |
commit | c4dfbae8967f175ed497b7ee8be921ff4a0a35f0 (patch) | |
tree | cc3e342eefbcf28c7ffa8b40b6a332dd482d5f0c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ce5989bc1f98347cb35efa9bdcdaa45b5fd6bcfa (diff) | |
parent | e22cb1295e1d9d5711cef63972a7d014e14d3c73 (diff) |
[automerger skipped] Merge "Clean up the permission control code in framework" into qt-dev am: 4e1078e291 -s ours am: c6edf97d59 -s ours
am: e22cb1295e -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 66404a1224 is in history
Change-Id: I1f10ea10471386f6a8cb511f6b590c88f7fb7e81
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions