diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-25 23:15:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-25 23:15:43 +0000 |
| commit | 6a975c11a202412a41f974c73659da999b3b83aa (patch) | |
| tree | 248621658cfd41fcbb388dfe8a9c924858820778 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a2f8ee470119c7114db7ec9baa63c7b6d4cf8a47 (diff) | |
| parent | 816a7daf9b334c9b5ec9bdf7718f5d76dd0ddfee (diff) | |
Merge changes I28031a27,If98d7397 into qt-dev
* changes:
Fix a bug in IncidentCompanionService
Disable incidentd encryption.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions